summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog21
-rw-r--r--configure.ac443
-rw-r--r--ext/a52dec/gsta52dec.c2
-rw-r--r--ext/amrnb/amrnb.c3
-rw-r--r--ext/dvdnav/dvdnavsrc.c2
-rw-r--r--ext/dvdread/dvdreadsrc.c2
-rw-r--r--ext/lame/gstlame.c2
-rw-r--r--ext/mad/gstid3tag.c2
-rw-r--r--ext/mpeg2dec/gstmpeg2dec.c3
-rw-r--r--ext/sidplay/gstsiddec.cc2
-rw-r--r--gst/asfdemux/gstasf.c2
-rw-r--r--gst/dvdlpcmdec/gstdvdlpcmdec.c2
-rw-r--r--gst/dvdsub/gstdvdsubdec.c2
-rw-r--r--gst/iec958/ac3iec.c2
-rw-r--r--gst/mpegaudioparse/gstmpegaudioparse.c2
-rw-r--r--gst/mpegstream/gstmpegstream.c2
-rw-r--r--gst/realmedia/rmdemux.c28
17 files changed, 243 insertions, 279 deletions
diff --git a/ChangeLog b/ChangeLog
index 32423412..efdce643 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2006-04-01 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * configure.ac:
+ rework similarly to other modules
+ * ext/a52dec/gsta52dec.c:
+ * ext/amrnb/amrnb.c:
+ * ext/dvdnav/dvdnavsrc.c:
+ * ext/dvdread/dvdreadsrc.c:
+ * ext/lame/gstlame.c:
+ * ext/mad/gstid3tag.c:
+ * ext/mpeg2dec/gstmpeg2dec.c:
+ * ext/sidplay/gstsiddec.cc:
+ * gst/asfdemux/gstasf.c:
+ * gst/dvdlpcmdec/gstdvdlpcmdec.c:
+ * gst/dvdsub/gstdvdsubdec.c:
+ * gst/iec958/ac3iec.c:
+ * gst/mpegaudioparse/gstmpegaudioparse.c:
+ * gst/mpegstream/gstmpegstream.c:
+ * gst/realmedia/rmdemux.c: (plugin_init):
+ use the correct defines
+
2006-03-31 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index a46f85cc..00a48bb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,35 @@
-dnl autoconf configuration file for gst-plugins
-AC_INIT
-AC_CANONICAL_TARGET
+AC_PREREQ(2.52)
-dnl We disable static building for development, for time savings
-dnl this goes before AS_LIBTOOL to appease autoconf
-dnl *NOTE*: dnl this line before release, so release does static too
-AM_DISABLE_STATIC
+dnl initialize autoconf
+dnl when going to/from release please set the nano (fourth number) right !
+dnl releases only do Wall, cvs and prerelease does Werror too
+AC_INIT(GStreamer Ugly Plug-ins, 0.10.3.1,
+ http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
+ gst-plugins-ugly)
+
+dnl initialize automake
+AM_INIT_AUTOMAKE
+
+dnl define PACKAGE_VERSION_* variables
+AS_VERSION
+
+dnl check if this is a release version
+AS_NANO(GST_CVS="no", GST_CVS="yes")
+
+dnl can autoconf find the source ?
+AC_CONFIG_SRCDIR([ext/mad/gstmad.c])
+
+dnl define the output header for config
+AM_CONFIG_HEADER(config.h)
dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
AM_MAINTAINER_MODE
-dnl when going to/from release please set the nano (fourth number) right !
-dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gst-plugins-ugly, GST_PLUGINS_UGLY_VERSION, 0, 10, 3, 1,
- GST_CVS="no", GST_CVS="yes")
-
-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
+dnl sets host_* variables
+AC_CANONICAL_HOST
dnl our libraries and install dirs use major.minor as a version
-GST_MAJORMINOR=$GST_PLUGINS_UGLY_VERSION_MAJOR.$GST_PLUGINS_UGLY_VERSION_MINOR
+GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
dnl we override it here if we need to for the release candidate of new series
GST_MAJORMINOR=0.10
AC_SUBST(GST_MAJORMINOR)
@@ -30,221 +41,171 @@ dnl *** required versions of GStreamer stuff ***
GST_REQ=0.10.3
GSTPB_REQ=0.10.3
-AC_CONFIG_SRCDIR([ext/mad/gstmad.c])
-AM_CONFIG_HEADER(config.h)
+dnl *** autotools stuff ****
-dnl Add parameters for aclocal
-dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
-ACLOCAL_FLAGS="-I m4 -I common/m4"
-AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS)
+dnl allow for different autotools
+AS_AUTOTOOLS_ALTERNATE
-AC_PROG_CC
-AM_PROG_CC_STDC
-AM_PROG_AS
-AS="${CC}"
-AS_PROG_OBJC
+dnl Add parameters for aclocal
+AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
-dnl the gettext stuff needed
+dnl set up gettext
dnl AM_GNU_GETTEXT_VERSION(0.11.5)
dnl AM_GNU_GETTEXT([external])
-
-dnl GETTEXT_PACKAGE=gst-plugins-ugly-$GST_MAJORMINOR
-dnl AC_SUBST(GETTEXT_PACKAGE)
-dnl AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
-dnl [gettext package name])
-
-dnl define LOCALEDIR in config.h
-dnl AS_AC_EXPAND(LOCALEDIR, $datadir/locale)
-dnl AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR",
-dnl [gettext locale dir])
-
-dnl decide on error flags
-AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
-
-if test "x$GST_WALL" = "xyes"; then
- GST_ERROR="$GST_ERROR -Wall"
-
- if test "x$GST_CVS" = "xyes"; then
- AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
- fi
-fi
+dnl GST_GETTEXT([gst-plugins-ugly-$GST_MAJOR_MINOR])
-dnl determine c++ compiler
-AC_PROG_CXX
-dnl determine if c++ is available on this system
-AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
-dnl determine c++ preprocessor
-AC_PROG_CXXCPP
-AC_ISC_POSIX
+dnl *** check for arguments to configure ***
-AC_HEADER_STDC([])
-AC_C_INLINE
+GST_ARG_DEBUG
+GST_ARG_PROFILING
+GST_ARG_VALGRIND
+GST_ARG_GCOV
-dnl used by ext/a52dec
-AX_CREATE_STDINT_H
+GST_ARG_EXAMPLES
-dnl Check for malloc.h
-AC_CHECK_HEADER(malloc.h,[
- AC_DEFINE(HAVE_MALLOC_H, 1, [whether malloc.h available])
-])
+GST_ARG_WITH_PKG_CONFIG_PATH
+GST_ARG_WITH_PACKAGE_NAME
+GST_ARG_WITH_PACKAGE_ORIGIN
-dnl Check for a way to display the function name in debug output
-GST_CHECK_FUNCTION()
+dnl these are all the gst plug-ins, compilable without additional libs
+GST_PLUGINS_ALL="\
+ asfdemux \
+ dvdlpcmdec \
+ dvdsub \
+ iec958 \
+ mpegaudioparse \
+ mpegstream \
+ realmedia \
+ "
-dnl define correct errorlevel for debugging messages. We want to have GST_ERROR
-dnl messages printed when running cvs builds
-if test "x$GST_CVS" = "xyes"; then
- AC_DEFINE(GST_LEVEL_DEFAULT, GST_LEVEL_ERROR, [Default errorlevel to use])
-fi
+AC_SUBST(GST_PLUGINS_ALL)
-dnl Check for FIONREAD ioctl declaration :
-GST_CHECK_FIONREAD()
+GST_PLUGINS_SELECTED=""
+
+AC_ARG_WITH(plugins,
+ AC_HELP_STRING([--with-plugins],
+ [comma-separated list of plug-ins to compile]),
+ [for i in `echo $withval | tr , ' '`; do
+ if echo $GST_PLUGINS_ALL | grep $i > /dev/null
+ then
+ GST_PLUGINS_SELECTED="$GST_PLUGINS_SELECTED $i"
+ else
+ echo "plug-in $i not recognized, ignoring..."
+ fi
+ done],
+ [GST_PLUGINS_SELECTED=$GST_PLUGINS_ALL])
-dnl ############################################
-dnl # Super Duper options for plug-in building #
-dnl ############################################
+AC_SUBST(GST_PLUGINS_SELECTED)
dnl ext plug-ins; plug-ins that have external dependencies
GST_CHECK_FEATURE(EXTERNAL, [enable building of plug-ins with external deps],,
-[HAVE_EXTERNAL=yes],enabled,
-[
- AC_MSG_WARN(building external plug-ins)
- BUILD_EXTERNAL="yes"
-],[
- AC_MSG_WARN(all plug-ins with external dependencies will not be built)
- BUILD_EXTERNAL="no"
-])
-# make BUILD_EXTERNAL available to Makefile.am
+ [HAVE_EXTERNAL=yes], enabled,
+ [
+ AC_MSG_NOTICE(building external plug-ins)
+ BUILD_EXTERNAL="yes"
+ ],[
+ AC_MSG_NOTICE(all plug-ins with external dependencies will not be built)
+ BUILD_EXTERNAL="no"
+ ])
AM_CONDITIONAL(BUILD_EXTERNAL, test "x$BUILD_EXTERNAL" = "xyes")
-dnl ##############################
-dnl # Do automated configuration #
-dnl ##############################
+dnl *** checks for platform ***
-dnl Check for tools:
-dnl ================
+dnl * hardware/architecture *
-dnl allow for different autotools
-AS_AUTOTOOLS_ALTERNATE()
+dnl common/m4/gst-arch.m4
+dnl check CPU type
+GST_ARCH
-dnl modify pkg-config path
-AC_ARG_WITH(pkg-config-path,
- AC_HELP_STRING([--with-pkg-config-path],[colon-separated list of pkg-config(1) dirs]),
- [export PKG_CONFIG_PATH=${withval}])
+dnl Determine endianness
+AC_C_BIGENDIAN
-GST_DOCBOOK_CHECK()
-dnl check architecture
-GST_ARCH()
+dnl *** checks for programs ***
-dnl check for gstreamer
-dnl uninstalled is selected preferentially -- see pkg-config(1)
-PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ,
- HAVE_GST="yes", HAVE_GST="no")
+dnl find a compiler
+AC_PROG_CC
-if test "x$HAVE_GST" = "xno"; then
- AC_MSG_ERROR(no GStreamer found)
-fi
+dnl determine c++ compiler
+AC_PROG_CXX
+dnl determine if c++ is available on this system
+AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
-GST_TOOLS_DIR=`pkg-config --variable=toolsdir gstreamer-$GST_MAJORMINOR`
-if test -z $GST_TOOLS_DIR; then
- AC_MSG_ERROR([no tools dir defined in GStreamer pkg-config file; core upgrade needed.])
-fi
-AC_SUBST(GST_TOOLS_DIR)
+AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
+AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
-dnl check for gstreamer-base; uninstalled is selected preferentially
-PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_MAJORMINOR >= $GST_REQ,
- HAVE_GST_BASE="yes", HAVE_GST_BASE="no")
+dnl check for documentation tools
+GTK_DOC_CHECK([1.3])
+AS_PATH_PYTHON([2.1])
-if test "x$HAVE_GST_BASE" = "xno"; then
- AC_MSG_ERROR(no GStreamer Base Libs found)
-fi
+dnl *** checks for libraries ***
-AC_SUBST(GST_BASE_LIBS)
-AC_SUBST(GST_BASE_CFLAGS)
+dnl *** checks for header files ***
-dnl check for gstreamer-plugins-base; uinstalled is selected preferentially
-PKG_CHECK_MODULES(GST_PLUGINS_BASE,
- gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPB_REQ,
- HAVE_GST_PLUGINS_BASE="yes", HAVE_GST_PLUGINS_BASE="no")
+dnl used by ext/a52dec
+AX_CREATE_STDINT_H
-if test "x$HAVE_GST_PLUGINS_BASE" = "xno"; then
- AC_MSG_ERROR(no GStreamer Base Plugins development files found)
-fi
+dnl Check for malloc.h
+AC_CHECK_HEADERS([malloc.h])
-AC_SUBST(GST_PLUGINS_BASE_LIBS)
-AC_SUBST(GST_PLUGINS_BASE_CFLAGS)
+dnl *** checks for types/defines ***
-dnl Determine endianness
-AC_C_BIGENDIAN
+dnl *** checks for structures ***
-dnl Check for essential libraries first:
-dnl ====================================
+dnl *** checks for compiler characteristics ***
-GST_GLIB_CHECK([2.6.0])
+dnl *** checks for library functions ***
-dnl Check for additional libraries that we might use:
-dnl =================================================
+dnl Check for a way to display the function name in debug output
+GST_CHECK_FUNCTION
-# we set the defaults always to make sure we have non-empty variables
-# for the Makefile
+dnl *** checks for dependancy libraries ***
-PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.0, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
-AC_SUBST(LIBOIL_CFLAGS)
-AC_SUBST(LIBOIL_LIBS)
-if test "x${HAVE_LIBOIL}" = xyes ; then
- AC_DEFINE_UNQUOTED(HAVE_LIBOIL, 1, [Define if liboil is being used])
- true
+dnl liboil is required
+PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.6, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
+if test "x$HAVE_LIBOIL" != "xyes"
+then
+ AC_ERROR([liboil-0.3.6 or later is required])
fi
-dnl ===========================================================================
-dnl ============================= gst plug-ins ================================
-dnl ===========================================================================
+dnl checks for gstreamer
+dnl uninstalled is selected preferentially -- see pkg-config(1)
+GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ])
+GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ])
+GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
+GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ])
-plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
-AC_SUBST(plugindir)
+dnl FIXME: get rid of this by making sure gstreamer-check brings it in
+dnl check for "check", unit testing library/header
+AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no)
+AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '[_]*(gst_|Gst|GST_).*' $GST_LIBS -no-undefined"
-AC_SUBST(GST_PLUGIN_LDFLAGS)
+dnl *** set variables based on configure arguments ***
-dnl these are all the gst plug-ins, compilable without additional libs
-GST_PLUGINS_ALL="\
- asfdemux \
- dvdlpcmdec \
- dvdsub \
- iec958 \
- mpegaudioparse \
- mpegstream \
- realmedia \
- "
-
-dnl see if we can build C++ plug-ins
-if test "x$HAVE_CXX" = "xyes"; then
- GST_PLUGINS_ALL="$GST_PLUGINS_ALL"
-else
- AC_MSG_WARN([Not compiling plug-ins requiring C++ compiler])
-fi
+dnl set license and copyright notice
+GST_LICENSE="LGPL"
+AC_DEFINE_UNQUOTED(GST_LICENSE, "$GST_LICENSE", [GStreamer license])
+AC_SUBST(GST_LICENSE)
-AC_SUBST(GST_PLUGINS_ALL)
+dnl set location of plugin directory
+GST_SET_PLUGINDIR
-GST_PLUGINS_SELECTED=""
+dnl define an ERROR_CFLAGS Makefile variable
+GST_SET_ERROR_CFLAGS($GST_CVS)
-AC_ARG_WITH(plugins,
- AC_HELP_STRING([--with-plugins],[comma-separated list of plug-ins to compile]),
- [for i in `echo $withval | tr , ' '`; do
- if echo $GST_PLUGINS_ALL | grep $i > /dev/null
- then
- GST_PLUGINS_SELECTED="$GST_PLUGINS_SELECTED $i"
- else
- echo "plug-in $i not recognized, ignoring..."
- fi
- done],
- [GST_PLUGINS_SELECTED=$GST_PLUGINS_ALL])
+dnl define correct level for debugging messages
+GST_SET_LEVEL_DEFAULT($GST_CVS)
-AC_SUBST(GST_PLUGINS_SELECTED)
+dnl used in examples
+GST_DEFAULT_ELEMENTS
+
+dnl *** ext plug-ins ***
+dnl keep this list sorted alphabetically !
-dnl ###########################
-dnl # Configure external libs #
-dnl ###########################
+if test "x$BUILD_EXTERNAL" = "xyes"; then
+
+echo
+AC_MSG_NOTICE([Checking libraries for plugins in ext/])
+echo
dnl *** a52dec ***
translit(dnm, m, l) AM_CONDITIONAL(USE_A52DEC, true)
@@ -332,7 +293,8 @@ int main (int argc, char *argv[])
dnl *** id3tag from the MAD project ***
translit(dnm, m, l) AM_CONDITIONAL(USE_ID3TAG, true)
-GST_CHECK_FEATURE(ID3TAG, [id3tag reading and writing from the MAD project], id3tag, [
+GST_CHECK_FEATURE(ID3TAG, [id3tag reading and writing from the MAD project],
+ id3tag, [
dnl check with pkg-config first
PKG_CHECK_MODULES(ID3TAG, id3tag >= 0.15, HAVE_ID3TAG="yes", HAVE_ID3TAG="no")
if test "x$HAVE_ID3TAG" = "xno"; then
@@ -340,7 +302,8 @@ GST_CHECK_FEATURE(ID3TAG, [id3tag reading and writing from the MAD project], id3
AC_CHECK_HEADER(id3tag.h, [
save_LIBS=$LIBS
LIBS="-lz"
- AC_CHECK_LIB(id3tag, id3_tag_options, HAVE_ID3TAG="yes" ID3TAG_LIBS="-lid3tag -lz")
+ AC_CHECK_LIB(id3tag, id3_tag_options,
+ HAVE_ID3TAG="yes" ID3TAG_LIBS="-lid3tag -lz")
LIBS=$save_LIBS
])
fi
@@ -352,16 +315,18 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true)
GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
if test "x$HAVE_ID3TAG" = "xyes"; then
dnl check with pkg-config first
- PKG_CHECK_MODULES(MAD, mad >= 0.15 id3tag >= 0.15, HAVE_MAD="yes", HAVE_MAD="no")
+ PKG_CHECK_MODULES(MAD, mad >= 0.15 id3tag >= 0.15,
+ HAVE_MAD="yes", HAVE_MAD="no")
if test "x$HAVE_MAD" = "xno"; then
dnl fall back to oldskool detection
AC_CHECK_HEADER(mad.h, [
- AC_CHECK_LIB(mad, mad_decoder_finish, HAVE_MAD="yes" MAD_LIBS="-lmad $ID3TAG_LIBS")
+ AC_CHECK_LIB(mad, mad_decoder_finish,
+ HAVE_MAD="yes" MAD_LIBS="-lmad $ID3TAG_LIBS")
])
fi
else
HAVE_MAD="no"
- AC_MSG_WARN([libid3tag was not available, cannot build MAD MP3 decoder plugin])
+ AC_MSG_WARN([libid3tag not available, cannot build MAD MP3 decoder plugin])
fi
])
AC_SUBST(MAD_LIBS)
@@ -381,63 +346,50 @@ GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [
GST_PATH_SIDPLAY()
])
-dnl also add builddir include for enumtypes and marshal
-GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_ERROR"
+fi dnl of EXT plugins
-AC_SUBST(GST_LIBS)
-AC_SUBST(GST_CFLAGS)
+dnl *** finalize CFLAGS, LDFLAGS, LIBS
-dnl ######################
-dnl # Checks for gtk-doc #
-dnl ######################
+dnl Overview:
+dnl GST_OPTION_CFLAGS: common flags for profiling, debugging, errors, ...
+dnl GST_*: flags shared by built objects to link against GStreamer
+dnl GST_ALL_LDFLAGS: linker flags shared by all
+dnl GST_LIB_LDFLAGS: additional linker flags for all libaries
+dnl GST_LT_LDFLAGS: library versioning of our libraries
+dnl GST_PLUGIN_LDFLAGS: flags to be used for all plugins
-GTK_DOC_CHECK([1.3])
-AS_PATH_PYTHON([2.1])
+dnl GST_OPTION_CFLAGS
+if test "x$USE_DEBUG" = xyes; then
+ PROFILE_CFLAGS="-g"
+fi
+AC_SUBST(PROFILE_CFLAGS)
-dnl ############################
-dnl # Set up some more defines #
-dnl ############################
+DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED"
+AC_SUBST(DEPRECATED_CFLAGS)
-dnl set license and copyright notice
-AC_DEFINE(GST_LICENSE, "LGPL", [GStreamer license])
-
-dnl package name in plugins
-AC_ARG_WITH(package-name,
-AC_HELP_STRING([--with-package-name],[specify package name to use in plugins]),
-[case "${withval}" in
- yes) AC_MSG_ERROR(bad value ${withval} for --with-package-name) ;;
- no) AC_MSG_ERROR(bad value ${withval} for --with-package-name) ;;
- *) GST_PACKAGE="${withval}" ;;
-esac],
-[
-dnl default value
-if test "x$GST_CVS" = "xyes"
-then
- dnl nano >= 1
- GST_PACKAGE="GStreamer CVS/prerelease"
-else
- GST_PACKAGE="GStreamer source release"
-fi
-]
-)
-AC_MSG_NOTICE(Using $GST_PACKAGE as package name)
-AC_DEFINE_UNQUOTED(GST_PACKAGE, "$GST_PACKAGE", [package name in plugins])
-
-dnl package origin URL
-AC_ARG_WITH(package-origin,
-AC_HELP_STRING([--with-package-origin],[specify package origin URL to use in plugins]),
-[case "${withval}" in
- yes) AC_MSG_ERROR(bad value ${withval} for --with-package-origin) ;;
- no) AC_MSG_ERROR(bad value ${withval} for --with-package-origin) ;;
- *) GST_ORIGIN="${withval}" ;;
-esac],
-[GST_ORIGIN="http://gstreamer.freedesktop.org/"]) dnl Default value
-AC_MSG_NOTICE(Using $GST_ORIGIN as package origin)
-AC_DEFINE_UNQUOTED(GST_ORIGIN, "$GST_ORIGIN", [package origin])
-
-dnl #########################
-dnl # Make the output files #
-dnl #########################
+dnl every flag in GST_OPTION_CFLAGS can be overridden at make time
+GST_OPTION_CFLAGS="\$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
+AC_SUBST(GST_OPTION_CFLAGS)
+
+dnl FIXME: do we want to rename to GST_ALL_* ?
+dnl prefer internal headers to already installed ones
+dnl also add builddir include for enumtypes and marshal
+dnl add GST_OPTION_CFLAGS, but overridable
+GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CFLAGS)"
+AC_SUBST(GST_CFLAGS)
+AC_SUBST(GST_LIBS)
+
+dnl LDFLAGS really should only contain flags, not libs - they get added before
+dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
+GST_ALL_LDFLAGS="-no-undefined"
+AC_SUBST(GST_ALL_LDFLAGS)
+
+dnl this really should only contain flags, not libs - they get added before
+dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
+AC_SUBST(GST_PLUGIN_LDFLAGS)
+
+dnl *** output files ***
dnl po/Makefile.in
@@ -470,15 +422,4 @@ gst-plugins-ugly.spec
)
AC_OUTPUT
-echo "configure: *** Core plug-ins, always built:"
-( for i in $GST_PLUGINS_ALL; do echo -e '\t'$i; done ) | sort
-echo
-echo -n "configure: *** Plug-ins relying on libraries that will be built:"
-echo -e "$GST_PLUGINS_YES" | sort
-echo
-echo -n "configure: *** Plug-ins relying on libraries that will NOT be built:"
-echo -e "$GST_PLUGINS_NO" | sort
-echo
-if test "x$BUILD_EXTERNAL" = "xno"; then
- echo "configure: *** No external plug-ins will be built"
-fi
+GST_OUTPUT_PLUGINS
diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c
index d7108427..76b286e2 100644
--- a/ext/a52dec/gsta52dec.c
+++ b/ext/a52dec/gsta52dec.c
@@ -760,4 +760,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"a52dec",
"Decodes ATSC A/52 encoded audio streams",
- plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN);
+ plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/amrnb/amrnb.c b/ext/amrnb/amrnb.c
index 96162715..c614b179 100644
--- a/ext/amrnb/amrnb.c
+++ b/ext/amrnb/amrnb.c
@@ -41,4 +41,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"amrnb",
"Adaptive Multi-Rate Narrow-Band",
- plugin_init, VERSION, GST_LICENSE_UNKNOWN, GST_PACKAGE, GST_ORIGIN);
+ plugin_init, VERSION, GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME,
+ GST_PACKAGE_ORIGIN);
diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c
index ea0e5dec..970d04d2 100644
--- a/ext/dvdnav/dvdnavsrc.c
+++ b/ext/dvdnav/dvdnavsrc.c
@@ -2188,4 +2188,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"dvdnav",
"Access a DVD with navigation features using libdvdnav",
- plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c
index 2c081700..21025a84 100644
--- a/ext/dvdread/dvdreadsrc.c
+++ b/ext/dvdread/dvdreadsrc.c
@@ -1337,4 +1337,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"dvdread",
"Access a DVD with dvdread",
- plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c
index a6a3f067..8a86fc16 100644
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
@@ -1249,4 +1249,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"lame",
"Encode MP3's with LAME",
- plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c
index 9692cbcc..bfd0b1a5 100644
--- a/ext/mad/gstid3tag.c
+++ b/ext/mad/gstid3tag.c
@@ -1523,4 +1523,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"mad",
"id3 tag manipulation and mp3 decoding based on the mad library",
- plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c
index f8133792..d2e0d7b6 100644
--- a/ext/mpeg2dec/gstmpeg2dec.c
+++ b/ext/mpeg2dec/gstmpeg2dec.c
@@ -1526,4 +1526,5 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"mpeg2dec",
- "LibMpeg2 decoder", plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN);
+ "LibMpeg2 decoder", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME,
+ GST_PACKAGE_ORIGIN);
diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc
index cd04c879..42316ef8 100644
--- a/ext/sidplay/gstsiddec.cc
+++ b/ext/sidplay/gstsiddec.cc
@@ -716,4 +716,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"siddec",
"Uses libsid to decode .sid files",
- plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/asfdemux/gstasf.c b/gst/asfdemux/gstasf.c
index 32a8634e..9b59a0ec 100644
--- a/gst/asfdemux/gstasf.c
+++ b/gst/asfdemux/gstasf.c
@@ -42,4 +42,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"asf",
"Demuxes and muxes audio and video in Microsofts ASF format",
- plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/dvdlpcmdec/gstdvdlpcmdec.c b/gst/dvdlpcmdec/gstdvdlpcmdec.c
index c1bb62dc..b7b854c4 100644
--- a/gst/dvdlpcmdec/gstdvdlpcmdec.c
+++ b/gst/dvdlpcmdec/gstdvdlpcmdec.c
@@ -633,4 +633,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"dvdlpcmdec",
"Decode DVD LPCM frames into standard PCM",
- plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c
index d469b1e8..e02291a5 100644
--- a/gst/dvdsub/gstdvdsubdec.c
+++ b/gst/dvdsub/gstdvdsubdec.c
@@ -989,4 +989,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"dvdsub",
"Decode DVD subtitles to AYUV video frames", plugin_init,
- VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+ VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/iec958/ac3iec.c b/gst/iec958/ac3iec.c
index c1afff15..13851c4c 100644
--- a/gst/iec958/ac3iec.c
+++ b/gst/iec958/ac3iec.c
@@ -455,4 +455,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"iec958",
"Convert raw AC3 into IEC958 (S/PDIF) frames",
- plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN);
+ plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 2da2bd9f..6aca2581 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -615,4 +615,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"mpegaudioparse",
"MPEG-1 layer 1/2/3 audio parser",
- plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/mpegstream/gstmpegstream.c b/gst/mpegstream/gstmpegstream.c
index 60331e53..19a938ec 100644
--- a/gst/mpegstream/gstmpegstream.c
+++ b/gst/mpegstream/gstmpegstream.c
@@ -45,4 +45,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"mpegstream",
"MPEG system stream parser",
- plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c
index cfc95211..574b2c44 100644
--- a/gst/realmedia/rmdemux.c
+++ b/gst/realmedia/rmdemux.c
@@ -251,20 +251,7 @@ gst_rmdemux_init (GstRMDemux * rmdemux)
}
static gboolean
-plugin_init (GstPlugin * plugin)
-{
- return gst_element_register (plugin, "rmdemux",
- GST_RANK_PRIMARY, GST_TYPE_RMDEMUX);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- "rmdemux",
- "Realmedia stream demuxer",
- plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
-
-
- static gboolean gst_rmdemux_sink_event (GstPad * pad, GstEvent * event)
+gst_rmdemux_sink_event (GstPad * pad, GstEvent * event)
{
gboolean ret = TRUE;
@@ -1921,3 +1908,16 @@ gst_rmdemux_parse_packet (GstRMDemux * rmdemux, const void *data,
beach:
return ret;
}
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+ return gst_element_register (plugin, "rmdemux",
+ GST_RANK_PRIMARY, GST_TYPE_RMDEMUX);
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+ GST_VERSION_MINOR,
+ "rmdemux",
+ "Realmedia stream demuxer",
+ plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 07:00:30 +0000