Merge remote-tracking branch 'tgurr/osg' into master
This commit is contained in:
commit
ca476c4b68
@ -23,7 +23,6 @@ LICENCES="wxWinLL-3 LGPL-2.1"
|
|||||||
SLOT="0"
|
SLOT="0"
|
||||||
PLATFORMS="~amd64 ~x86"
|
PLATFORMS="~amd64 ~x86"
|
||||||
MYOPTIONS="
|
MYOPTIONS="
|
||||||
( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
|
|
||||||
( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
|
( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
|
||||||
"
|
"
|
||||||
|
|
||||||
@ -33,6 +32,7 @@ DEPENDENCIES="
|
|||||||
build+run:
|
build+run:
|
||||||
app-text/poppler[cairo]
|
app-text/poppler[cairo]
|
||||||
dev-libs/glib:2
|
dev-libs/glib:2
|
||||||
|
media/ffmpeg
|
||||||
media-libs/freetype:2
|
media-libs/freetype:2
|
||||||
media-libs/giflib:=
|
media-libs/giflib:=
|
||||||
media-libs/gstreamer:1.0
|
media-libs/gstreamer:1.0
|
||||||
@ -49,10 +49,8 @@ DEPENDENCIES="
|
|||||||
x11-libs/cairo
|
x11-libs/cairo
|
||||||
x11-libs/libX11
|
x11-libs/libX11
|
||||||
x11-libs/libXrandr
|
x11-libs/libXrandr
|
||||||
providers:ffmpeg? ( media/ffmpeg )
|
|
||||||
providers:ijg-jpeg? ( media-libs/jpeg:= )
|
providers:ijg-jpeg? ( media-libs/jpeg:= )
|
||||||
providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
|
providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
|
||||||
providers:libav? ( media/libav )
|
|
||||||
"
|
"
|
||||||
|
|
||||||
CMAKE_SRC_CONFIGURE_PARAMS=(
|
CMAKE_SRC_CONFIGURE_PARAMS=(
|
||||||
|
Loading…
Reference in New Issue
Block a user