mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-03 15:06:34 +00:00
second attempt fixing gdkpixbuf stuff
Original commit message from CVS: second attempt fixing gdkpixbuf stuff
This commit is contained in:
parent
bd2035d858
commit
68c32e2d14
3 changed files with 18 additions and 3 deletions
|
@ -65,6 +65,10 @@ raw1394/linux1394 (for the dv plugin)
|
||||||
libdvdread (for the dvdsrc)
|
libdvdread (for the dvdsrc)
|
||||||
http://www.dtek.chalmers.se/groups/dvd/
|
http://www.dtek.chalmers.se/groups/dvd/
|
||||||
(optional: libcss for encrypted DVDs)
|
(optional: libcss for encrypted DVDs)
|
||||||
|
libdvdnav (for the dvdnavsrc)
|
||||||
|
http://dvd.sourceforge.net/
|
||||||
|
(optional: libcss for encrypted DVDs)
|
||||||
|
>= 0.1.9
|
||||||
libesound (for the esd sink
|
libesound (for the esd sink
|
||||||
ftp.gnome.org/pub/GNOME/stable/sources/esound)
|
ftp.gnome.org/pub/GNOME/stable/sources/esound)
|
||||||
gnome-vfs (for the gnome-vfs src)
|
gnome-vfs (for the gnome-vfs src)
|
||||||
|
|
15
configure.ac
15
configure.ac
|
@ -219,7 +219,18 @@ dnl Check for essential libraries first:
|
||||||
dnl ====================================
|
dnl ====================================
|
||||||
|
|
||||||
GST_GLIB2_CHECK()
|
GST_GLIB2_CHECK()
|
||||||
PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
|
|
||||||
|
dnl GTK
|
||||||
|
HAVE_GTK=NO
|
||||||
|
PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no)
|
||||||
|
if test "x$HAVE_GTK_22" = "xyes"; then
|
||||||
|
HAVE_GTK=yes
|
||||||
|
else
|
||||||
|
PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK_20=yes, HAVE_GTK_20=no)
|
||||||
|
fi
|
||||||
|
if test "x$HAVE_GTK_20" = "xyes"; then
|
||||||
|
HAVE_GTK=yes
|
||||||
|
fi
|
||||||
GTK_CFLAGS=$GTK2_CFLAGS
|
GTK_CFLAGS=$GTK2_CFLAGS
|
||||||
GTK_LIBS=$GTK2_LIBS
|
GTK_LIBS=$GTK2_LIBS
|
||||||
AC_SUBST(GTK_LIBS)
|
AC_SUBST(GTK_LIBS)
|
||||||
|
@ -684,7 +695,7 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
|
||||||
dnl *** GDK pixbuf ***
|
dnl *** GDK pixbuf ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true)
|
translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true)
|
||||||
GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbufsrc, [
|
GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbufsrc, [
|
||||||
if test $HAVE_GTK = "yes"; then HAVE_GDK_PIXBUF=yes; fi;
|
if test $HAVE_GTK_22 = "yes"; then HAVE_GDK_PIXBUF=yes; fi;
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl *** Gnome VFS ***
|
dnl *** Gnome VFS ***
|
||||||
|
|
|
@ -103,7 +103,7 @@ read_config ($0);
|
||||||
%pipes = (
|
%pipes = (
|
||||||
"ac3", "a52dec ! $cfg{AUDIOSINK}",
|
"ac3", "a52dec ! $cfg{AUDIOSINK}",
|
||||||
"au", "auparse ! $cfg{AUDIOSINK}",
|
"au", "auparse ! $cfg{AUDIOSINK}",
|
||||||
"avi", "avidemux name=demux ! { queue ! ffmpegdecall ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }",
|
"avi", "avidemux name=demux ! { queue ! jpegdec ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }",
|
||||||
"asf", "asfdemux name=demux ! { queue ! ffmpegdecall ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }",
|
"asf", "asfdemux name=demux ! { queue ! ffmpegdecall ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }",
|
||||||
"flac", "flacdec ! $cfg{AUDIOSINK}",
|
"flac", "flacdec ! $cfg{AUDIOSINK}",
|
||||||
"fli", "flxdec ! colorspace ! $cfg{VIDEOSINK}",
|
"fli", "flxdec ! colorspace ! $cfg{VIDEOSINK}",
|
||||||
|
|
Loading…
Reference in a new issue