Merge remote-tracking branch 'tgurr/osg' into master

This commit is contained in:
Julian Ospald 2020-08-27 21:30:11 +02:00
commit ca476c4b68
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28

View File

@ -23,7 +23,6 @@ LICENCES="wxWinLL-3 LGPL-2.1"
SLOT="0"
PLATFORMS="~amd64 ~x86"
MYOPTIONS="
( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
"
@ -33,6 +32,7 @@ DEPENDENCIES="
build+run:
app-text/poppler[cairo]
dev-libs/glib:2
media/ffmpeg
media-libs/freetype:2
media-libs/giflib:=
media-libs/gstreamer:1.0
@ -49,10 +49,8 @@ DEPENDENCIES="
x11-libs/cairo
x11-libs/libX11
x11-libs/libXrandr
providers:ffmpeg? ( media/ffmpeg )
providers:ijg-jpeg? ( media-libs/jpeg:= )
providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
providers:libav? ( media/libav )
"
CMAKE_SRC_CONFIGURE_PARAMS=(