mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 16:50:47 +00:00
disable gdk_pixbuf by default
Original commit message from CVS: disable gdk_pixbuf by default
This commit is contained in:
Thomas Vander Stichele
parent
43e7f73d4b
commit
7012697bc0
4 changed files with 153 additions and 51 deletions
93
ChangeLog
93
ChangeLog
|
|
@ -1,2 +1,91 @@
|
|||
GStreamer does not use changelog files.
|
||||
The GStreamer developers use CVS commit messages as the replacement.
|
||||
2003-12-16 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
|
||||
* configure.ac: disable pixbuf loader by default as requested
|
||||
|
||||
2003-12-14 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
|
||||
* configure.ac: make pixbuf loader configurable
|
||||
|
||||
2003-12-14 Amaury Jacquot <sxpert@esitcom.org>
|
||||
|
||||
* sys/xvideo/gstximage.c: remove 3 unnecessary X headers
|
||||
* sys/xvideo/gstxvimage.c: same
|
||||
* sys/xvideo/gstxwindow.c: same
|
||||
these problems occur when using the X server from freedesktop.org
|
||||
|
||||
2003-12-03 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
|
||||
* common/m4/gst-feature.m4: *** instead of newline when not built
|
||||
* configure.ac: fix X detection when no X stuff present
|
||||
* gst-libs/gst/Makefile.am: put X dependencies inside conditional
|
||||
|
||||
2003-07-12 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
|
||||
* gst-plugins.spec.in: fix up spec file
|
||||
* gst/debug/Makefile.am:
|
||||
gst/realmedia/Makefile.am: use proper LD_FLAGS for plugins
|
||||
|
||||
2003-02-14 Colin Walters <walters@verbum.org>
|
||||
|
||||
* ext/gnomevfs/gstgnomevfssrc.c (unicodify,
|
||||
gst_gnomevfssrc_unicodify): New functions.
|
||||
(audiocast_thread_run): Use them. Remove redundant if from
|
||||
"if (foo) g_free (foo);" bits. Change fprintf to g_print.
|
||||
(gst_gnomevfssrc_received_headers_callback): Ditto.
|
||||
(gst_gnomevfssrc_get_icy_metadata): Ditto.
|
||||
|
||||
2003-02-06 Colin Walters <walters@gnu.org>
|
||||
|
||||
* ext/gnomevfs/gstgnomevfssrc.c: Port all the fixes from
|
||||
BRANCH-GSTREAMER-0_6.
|
||||
|
||||
2003-01-25 Colin Walters <walters@gnu.org>
|
||||
|
||||
* ext/gnomevfs/gstgnomevfssrc.c (gst_gnomevfssrc_open_file): Don't
|
||||
make a size request when in iradio mode.
|
||||
|
||||
2002-11-25 Colin Walters <walters@debian.org>
|
||||
|
||||
* ext/gnomevfs/gstgnomevfssrc.c (gst_gnomevfssrc_received_headers_callback):
|
||||
Test for url in correct variable.
|
||||
|
||||
2002-11-17 Ken MacLeod <ken@bitsko.slc.ut.us>
|
||||
|
||||
* gst/modplug/modplug_types.cc: Renamed from
|
||||
gst/modplug/modplug_types.c. Change GST_BUFFER_DATA(buf) result
|
||||
type from 'gchar' to 'gunit8'.
|
||||
|
||||
2002-07-07 Richard Boulton <richard@tartarus.org>
|
||||
|
||||
* LICENSE_readme: Mention that synaesthesia is derived from GPL
|
||||
code.
|
||||
|
||||
2002-06-03 Richard Boulton <richard@tartarus.org>
|
||||
|
||||
* m4/mpeg2dec.m4: Test for cpuaccel library as well as mpeg2dec
|
||||
library. Add appropriate includes before test compile of mpeg2.h
|
||||
so that compilation succeeds.
|
||||
|
||||
2002-05-06 Thomas Vander Stichele <thomas@apestaart.org>
|
||||
|
||||
* GConf stuff : from http://www.gnome.org/projects/gconf/ and eog
|
||||
- added gstreamer-gconf package
|
||||
|
||||
2002-02-06 Thomas Vander Stichele <thomas@apestaart.org>
|
||||
|
||||
* more build cleanup : merging over changes from gst-player
|
||||
|
||||
2002-01-17 Bastien Nocera <hadess@hadess.net>
|
||||
|
||||
* sys/Makefile.am: make the qcam plugin build only
|
||||
only platforms using NASM, ie. x86
|
||||
|
||||
2002-01-06 Rodney Dawes <dobey@free.fr>
|
||||
|
||||
* configure.ac: added -lm to cdparanoia check so it works,
|
||||
fixed a couple typos for the libraw1394 checks
|
||||
|
||||
2001-12-20 Thomas Vander Stichele <thomas@apestaart.org>
|
||||
|
||||
* opened gst-plugins module
|
||||
* starting with sys plugins
|
||||
|
|
|
|||
2
common
2
common
|
|
@ -1 +1 @@
|
|||
Subproject commit 9f37b3e515260c7b294222a502b2cc75dd0983b6
|
||||
Subproject commit cd5507ae3df8dc48c07df9e37878846b6b79faa1
|
||||
94
configure.ac
94
configure.ac
|
|
@ -241,7 +241,6 @@ 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
|
||||
AC_PATH_PROG(QUERYLOADERS, gdk-pixbuf-query-loaders, no)
|
||||
GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
|
||||
AC_SUBST(GTK_VERSION)
|
||||
GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
|
||||
|
|
@ -259,50 +258,67 @@ GTK_LIBS=$GTK2_LIBS
|
|||
AC_SUBST(GTK_LIBS)
|
||||
AC_SUBST(GTK_CFLAGS)
|
||||
AC_SUBST(HAVE_GTK)
|
||||
AM_CONDITIONAL(HAVE_GDK_LOADERS, test "x$HAVE_GTK_22" = "xyes")
|
||||
|
||||
# gdk_pixbuf gstreamer loader is considered experimental, so disable
|
||||
# by default
|
||||
if test "x$HAVE_GTK_22" = "xyes"; then
|
||||
HAVE_GDK_LOADERS=yes
|
||||
else
|
||||
HAVE_GDK_LOADERS=no
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(gdk-pixbuf-loader,
|
||||
AC_HELP_STRING([--enable-gdk-pixbuf-loader],
|
||||
[whether to enable building of gdk_pixbuf loader]),
|
||||
:, HAVE_GDK_LOADERS="no")
|
||||
|
||||
# allow customization of pixbuf loader install location
|
||||
# when nothing specified, adhere to prefix settings
|
||||
# when called without any option with this argument, autodetect
|
||||
# when called with a path, set to the given path
|
||||
AC_ARG_WITH(gdk-pixbuf-loader-dir,
|
||||
AC_HELP_STRING([--with-gdk-pixbuf-loader-dir],
|
||||
[directory to install the gdk_pixbuf loader (none for pkg-config default)]),
|
||||
[
|
||||
if test "x${withval}" != xyes ; then
|
||||
GDK_PIXBUF_LOADER_DIR="${withval}"
|
||||
else
|
||||
GDK_PIXBUF_LOADER_DIR="$GDK_PIXBUF_LIBDIR/gtk-2.0/\$GTK_VERSION/loaders"
|
||||
fi
|
||||
],
|
||||
# nothing specified
|
||||
GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
|
||||
)
|
||||
AS_AC_EXPAND(GDK_PIXBUF_LOADER_DIR, $GDK_PIXBUF_LOADER_DIR)
|
||||
AC_SUBST(GDK_PIXBUF_LOADER_DIR)
|
||||
AC_MSG_NOTICE([Putting GTK+-2 pixbuf loaders in $GDK_PIXBUF_LOADER_DIR])
|
||||
|
||||
# allow customization of pixbuf loader configuration file
|
||||
# when nothing specified, adhere to prefix settings
|
||||
# when called without any option with this argument, autodetect
|
||||
# when called with a path, set to the given path
|
||||
AC_ARG_WITH(gdk-pixbuf-conf-dir,
|
||||
AC_HELP_STRING([--with-gdk-pixbuf-conf-dir],
|
||||
[directory to install the gdk_pixbuf config (none for pkg-config default)]),
|
||||
[
|
||||
if test "x${withval}" != xyes ; then
|
||||
GDK_PIXBUF_CONF_DIR="${withval}"
|
||||
else
|
||||
GDK_PIXBUF_CONF_DIR="$GDK_PIXBUF_PREFIXDIR/etc/gtk-2.0/"
|
||||
fi
|
||||
],
|
||||
# nothing specified
|
||||
GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
|
||||
GDK_PIXBUF_CONF_DIR=${sysconfdir}/gtk-2.0
|
||||
)
|
||||
AS_AC_EXPAND(GDK_PIXBUF_CONF_DIR, $GDK_PIXBUF_CONF_DIR)
|
||||
AC_SUBST(GDK_PIXBUF_CONF_DIR)
|
||||
AC_MSG_NOTICE([Putting GTK+-2 pixbuf loader config in $GDK_PIXBUF_CONF_DIR])
|
||||
if test "x$HAVE_GDK_LOADERS" == "xyes"; then
|
||||
AC_PATH_PROG(QUERYLOADERS, gdk-pixbuf-query-loaders, no)
|
||||
AC_ARG_WITH(gdk-pixbuf-loader-dir,
|
||||
AC_HELP_STRING([--with-gdk-pixbuf-loader-dir],
|
||||
[directory to install the gdk_pixbuf loader (none for pkg-config default)]),
|
||||
[
|
||||
if test "x${withval}" != xyes ; then
|
||||
GDK_PIXBUF_LOADER_DIR="${withval}"
|
||||
else
|
||||
GDK_PIXBUF_LOADER_DIR="$GDK_PIXBUF_LIBDIR/gtk-2.0/\$GTK_VERSION/loaders"
|
||||
fi
|
||||
],
|
||||
# nothing specified
|
||||
GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
|
||||
)
|
||||
AS_AC_EXPAND(GDK_PIXBUF_LOADER_DIR, $GDK_PIXBUF_LOADER_DIR)
|
||||
AC_SUBST(GDK_PIXBUF_LOADER_DIR)
|
||||
AC_MSG_NOTICE([Putting GTK+-2 pixbuf loaders in $GDK_PIXBUF_LOADER_DIR])
|
||||
|
||||
# allow customization of pixbuf loader configuration file
|
||||
# when nothing specified, adhere to prefix settings
|
||||
# when called without any option with this argument, autodetect
|
||||
# when called with a path, set to the given path
|
||||
AC_ARG_WITH(gdk-pixbuf-conf-dir,
|
||||
AC_HELP_STRING([--with-gdk-pixbuf-conf-dir],
|
||||
[directory to install the gdk_pixbuf config (none for pkg-config default)]),
|
||||
[
|
||||
if test "x${withval}" != xyes ; then
|
||||
GDK_PIXBUF_CONF_DIR="${withval}"
|
||||
else
|
||||
GDK_PIXBUF_CONF_DIR="$GDK_PIXBUF_PREFIXDIR/etc/gtk-2.0/"
|
||||
fi
|
||||
],
|
||||
# nothing specified
|
||||
GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
|
||||
GDK_PIXBUF_CONF_DIR=${sysconfdir}/gtk-2.0
|
||||
)
|
||||
AS_AC_EXPAND(GDK_PIXBUF_CONF_DIR, $GDK_PIXBUF_CONF_DIR)
|
||||
AC_SUBST(GDK_PIXBUF_CONF_DIR)
|
||||
AC_MSG_NOTICE([Putting GTK+-2 pixbuf loader config in $GDK_PIXBUF_CONF_DIR])
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_GDK_LOADERS, test "x$HAVE_GDK_LOADERS" = "xyes")
|
||||
|
||||
dnl ===========================================================================
|
||||
dnl ============================= gst plug-ins ================================
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
plugin_LTLIBRARIES = libgstgdkpixbuf.la
|
||||
|
||||
libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c
|
||||
|
|
@ -11,13 +10,6 @@ if HAVE_GDK_LOADERS
|
|||
loaderdir = $(DESTDIR)$(GDK_PIXBUF_LOADER_DIR)
|
||||
loader_LTLIBRARIES = gst_loader.la
|
||||
|
||||
gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND
|
||||
gst_loader_la_SOURCES = \
|
||||
gstgdkanimation.c \
|
||||
gst_loader.c
|
||||
gst_loader_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) --avoid-version --module
|
||||
gst_loader_la_LIBADD = $(GTK_LIBS) $(GST_LIBS)
|
||||
|
||||
gst_loader_headers = gstgdkanimation.h
|
||||
|
||||
install-data-hook:
|
||||
|
|
@ -25,11 +17,16 @@ install-data-hook:
|
|||
$(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_CONF_DIR) ; \
|
||||
$(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_CONF_DIR)/gdk-pixbuf.loaders ; \
|
||||
fi
|
||||
|
||||
else
|
||||
gst_loader_headers =
|
||||
endif
|
||||
|
||||
gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND
|
||||
gst_loader_la_SOURCES = \
|
||||
gstgdkanimation.c \
|
||||
gst_loader.c
|
||||
gst_loader_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) --avoid-version --module
|
||||
gst_loader_la_LIBADD = $(GTK_LIBS) $(GST_LIBS)
|
||||
|
||||
noinst_HEADERS = gstgdkpixbuf.h \
|
||||
$(gst_loader_headers)
|
||||
|
|
|
|||
Loading…
Reference in a new issue