From d3cd53226ef4f89935fc9a039512e5d2d8a3fb31 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 7 Feb 2013 11:15:01 -0800 Subject: [PATCH] gst-app-maker/gst-element-maker: 1.0 updates --- tools/gst-app-maker | 5 +++-- tools/gst-project-maker | 36 ++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/tools/gst-app-maker b/tools/gst-app-maker index 4fecc30998..786cd64a76 100755 --- a/tools/gst-app-maker +++ b/tools/gst-app-maker @@ -98,6 +98,7 @@ cat <<-EOF #endif #include +#include #define GETTEXT_PACKAGE "replace" @@ -537,7 +538,7 @@ generate | sed \ gst-indent $gstreplace.c -gcc -Wall $(pkg-config --cflags gstreamer-0.10) -c -o $gstreplace.o $gstreplace.c -gcc -o $gstreplace $gstreplace.o $(pkg-config --libs gstreamer-0.10) +gcc -O2 -Wall $(pkg-config --cflags gstreamer-1.0) -c -o $gstreplace.o $gstreplace.c +gcc -o $gstreplace $gstreplace.o $(pkg-config --libs gstreamer-1.0) diff --git a/tools/gst-project-maker b/tools/gst-project-maker index a03ad9437a..657ad72616 100755 --- a/tools/gst-project-maker +++ b/tools/gst-project-maker @@ -122,11 +122,11 @@ dnl required version of autoconf AC_PREREQ([2.53]) dnl TODO: fill in your package name and package version here -AC_INIT([${gst__replace}],[0.10.0]) +AC_INIT([${gst__replace}],[1.0.0]) dnl required versions of gstreamer and plugins-base -GST_REQUIRED=0.10.16 -GSTPB_REQUIRED=0.10.16 +GST_REQUIRED=1.0.0 +GSTPB_REQUIRED=1.0.0 AC_CONFIG_SRCDIR([plugins/${gstreplace}.c]) AC_CONFIG_HEADERS([config.h]) @@ -155,19 +155,19 @@ dnl Check for the required version of GStreamer core (and gst-plugins-base) dnl This will export GST_CFLAGS and GST_LIBS variables for use in Makefile.am dnl dnl If you need libraries from gst-plugins-base here, also add: -dnl for libgstaudio-0.10: gstreamer-audio-0.10 >= \$GST_REQUIRED -dnl for libgstvideo-0.10: gstreamer-video-0.10 >= \$GST_REQUIRED -dnl for libgsttag-0.10: gstreamer-tag-0.10 >= \$GST_REQUIRED -dnl for libgstpbutils-0.10: gstreamer-pbutils-0.10 >= \$GST_REQUIRED -dnl for libgstfft-0.10: gstreamer-fft-0.10 >= \$GST_REQUIRED -dnl for libgstinterfaces-0.10: gstreamer-interfaces-0.10 >= \$GST_REQUIRED -dnl for libgstrtp-0.10: gstreamer-rtp-0.10 >= \$GST_REQUIRED -dnl for libgstrtsp-0.10: gstreamer-rtsp-0.10 >= \$GST_REQUIRED +dnl for libgstaudio-1.0: gstreamer-audio-1.0 >= \$GST_REQUIRED +dnl for libgstvideo-1.0: gstreamer-video-1.0 >= \$GST_REQUIRED +dnl for libgsttag-1.0: gstreamer-tag-1.0 >= \$GST_REQUIRED +dnl for libgstpbutils-1.0: gstreamer-pbutils-1.0 >= \$GST_REQUIRED +dnl for libgstfft-1.0: gstreamer-fft-1.0 >= \$GST_REQUIRED +dnl for libgstinterfaces-1.0: gstreamer-interfaces-1.0 >= \$GST_REQUIRED +dnl for libgstrtp-1.0: gstreamer-rtp-1.0 >= \$GST_REQUIRED +dnl for libgstrtsp-1.0: gstreamer-rtsp-1.0 >= \$GST_REQUIRED dnl etc. PKG_CHECK_MODULES(GST, [ - gstreamer-0.10 >= \$GST_REQUIRED - gstreamer-base-0.10 >= \$GST_REQUIRED - gstreamer-controller-0.10 >= \$GST_REQUIRED + gstreamer-1.0 >= \$GST_REQUIRED + gstreamer-base-1.0 >= \$GST_REQUIRED + gstreamer-controller-1.0 >= \$GST_REQUIRED ], [ AC_SUBST(GST_CFLAGS) AC_SUBST(GST_LIBS) @@ -175,8 +175,8 @@ PKG_CHECK_MODULES(GST, [ AC_MSG_ERROR([ You need to install or upgrade the GStreamer development packages on your system. On debian-based systems these are - libgstreamer0.10-dev and libgstreamer-plugins-base0.10-dev. - on RPM-based systems gstreamer0.10-devel, libgstreamer0.10-devel + libgstreamer1.0-dev and libgstreamer-plugins-base1.0-dev. + on RPM-based systems gstreamer1.0-devel, libgstreamer1.0-devel or similar. The minimum version required is \$GST_REQUIRED. ]) ]) @@ -194,9 +194,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ ], [ ])], [ dnl set the plugindir where plugins should be installed (for plugins/Makefile.am) if test "x\${prefix}" = "x\$HOME"; then - plugindir="\$HOME/.gstreamer-0.10/plugins" + plugindir="\$HOME/.gstreamer-1.0/plugins" else - plugindir="\\\$(libdir)/gstreamer-0.10" + plugindir="\\\$(libdir)/gstreamer-1.0" fi AC_SUBST(plugindir)