gst*1: cleanup common options

Don't use the shared options for gstreamer-0.10 and use them for more
packages.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 38 insertions, 42 deletions

diff --git a/rules/gst-plugins-bad1.make b/rules/gst-plugins-bad1.make
index 334c453c5..eb136d8df 100644
--- a/rules/gst-plugins-bad1.make
+++ b/rules/gst-plugins-bad1.make
@@ -216,9 +216,11 @@ GST_PLUGINS_BAD1_CONF_TOOL	:= autoconf
 
 GST_PLUGINS_BAD1_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
-	$(GSTREAMER_GENERIC_CONF_OPT) \
+	$(GSTREAMER1_GENERIC_CONF_OPT) \
+	\
 	--enable-external \
 	--enable-experimental \
+	--$(call ptx/endis, PTXCONF_GSTREAMER1_INTROSPECTION)-introspection \
 	\
 	--$(call ptx/endis,PTXCONF_GST_PLUGINS_BAD1_ORC)-orc \
 	\
diff --git a/rules/gst-plugins-base1.make b/rules/gst-plugins-base1.make
index 8b349f735..824043c67 100644
--- a/rules/gst-plugins-base1.make
+++ b/rules/gst-plugins-base1.make
@@ -73,12 +73,14 @@ GST_PLUGINS_BASE1_ENABLEP-y	+= $(GST_PLUGINS_BASE1_ENABLE-y)
 GST_PLUGINS_BASE1_CONF_TOOL	= autoconf
 GST_PLUGINS_BASE1_CONF_OPT	= \
 	$(CROSS_AUTOCONF_USR) \
-	$(GSTREAMER_GENERIC_CONF_OPT) \
+	$(GSTREAMER1_GENERIC_CONF_OPT) \
+	\
 	--enable-external \
 	--disable-experimental \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--$(call ptx/endis, PTXCONF_GSTREAMER1_INTROSPECTION)-introspection \
 	\
 	--$(call ptx/endis,PTXCONF_GST_PLUGINS_BASE1_ORC)-orc \
-	--enable-Bsymbolic \
 	\
 	--disable-iso-codes \
 	--$(call ptx/endis,PTXCONF_GST_PLUGINS_BASE1_ZLIB)-zlib \
diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make
index 8f5156d23..a4586f5dd 100644
--- a/rules/gst-plugins-good1.make
+++ b/rules/gst-plugins-good1.make
@@ -122,7 +122,7 @@ GST_PLUGINS_GOOD1_CONF_ENV := \
 GST_PLUGINS_GOOD1_CONF_TOOL	:= autoconf
 GST_PLUGINS_GOOD1_CONF_OPT	= \
 	$(CROSS_AUTOCONF_USR) \
-	$(GSTREAMER_GENERIC_CONF_OPT) \
+	$(GSTREAMER1_GENERIC_CONF_OPT) \
 	--enable-external \
 	--enable-experimental \
 	\
diff --git a/rules/gst-plugins-ugly1.make b/rules/gst-plugins-ugly1.make
index 1c4fd3478..b98017cc8 100644
--- a/rules/gst-plugins-ugly1.make
+++ b/rules/gst-plugins-ugly1.make
@@ -59,19 +59,10 @@ GST_PLUGINS_UGLY1_ENABLEP-y	+= $(GST_PLUGINS_UGLY1_ENABLE-y)
 GST_PLUGINS_UGLY1_CONF_TOOL	:= autoconf
 GST_PLUGINS_UGLY1_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	$(GSTREAMER1_GENERIC_CONF_OPT) \
 	--enable-option-checking \
-	--enable-silent-rules \
-        --disable-nls \
-        --disable-rpath \
-	--disable-debug \
-	--disable-profiling \
-	--disable-valgrind \
-	--disable-gcov \
-	--disable-examples \
 	--enable-external \
-	--enable-experimental \
-	--disable-gtk-doc \
-	--with-package-origin="PTXDist"
+	--enable-experimental
 
 #
 # the --with-plugins sadly only applies to depencyless plugings
diff --git a/rules/gst-rtsp-server1.make b/rules/gst-rtsp-server1.make
index e6cb1dec3..7aca5e39c 100644
--- a/rules/gst-rtsp-server1.make
+++ b/rules/gst-rtsp-server1.make
@@ -35,17 +35,17 @@ GST_RTSP_SERVER1_LICENSE	:= LGPL-2.0+
 GST_RTSP_SERVER1_CONF_TOOL	:= autoconf
 GST_RTSP_SERVER1_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--disable-extra-check \
-	--disable-debug \
+	$(GSTREAMER1_BASIC_CONF_OPT) \
+	\
 	--disable-valgrind \
 	--disable-gcov \
 	--disable-examples \
 	--disable-tests \
 	--disable-introspection \
 	--disable-docbook \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf
+	\
+	--enable-Bsymbolic \
+	--disable-static-plugins
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/gstreamer-vaapi1.make b/rules/gstreamer-vaapi1.make
index 5f415dc69..f428ba0bb 100644
--- a/rules/gstreamer-vaapi1.make
+++ b/rules/gstreamer-vaapi1.make
@@ -41,17 +41,11 @@ GSTREAMER_VAAPI1_ENABLE-$(PTXCONF_GSTREAMER_VAAPI1_EGL)		+= egl
 GSTREAMER_VAAPI1_CONF_TOOL	:= autoconf
 GSTREAMER_VAAPI1_CONF_OPT	= \
 	$(CROSS_AUTOCONF_USR) \
-	--runstatedir=/run \
-	--disable-fatal-warnings \
-	--disable-extra-check \
-	--disable-debug \
+	$(GSTREAMER1_BASIC_CONF_OPT) \
+	\
 	--enable-encoders \
 	$(addprefix --enable-,$(GSTREAMER_VAAPI1_ENABLE-y)) \
-	$(addprefix --disable-,$(GSTREAMER_VAAPI1_ENABLE-)) \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
-	--disable-gobject-cast-checks
+	$(addprefix --disable-,$(GSTREAMER_VAAPI1_ENABLE-))
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/gstreamer1.make b/rules/gstreamer1.make
index 76e1c2d39..d151f1ea0 100644
--- a/rules/gstreamer1.make
+++ b/rules/gstreamer1.make
@@ -33,31 +33,37 @@ GSTREAMER1_LICENSE	:= LGPL-2.1+
 #
 # autoconf
 #
-GSTREAMER1_GENERIC_CONF_OPT = \
+GSTREAMER1_BASIC_CONF_OPT = \
 	--runstatedir=/run \
-	--disable-nls \
-	--disable-rpath \
+	\
 	--disable-fatal-warnings \
 	--disable-extra-check \
 	\
 	--disable-debug \
-	--disable-profiling \
-	--disable-valgrind \
-	--disable-gcov \
-	--disable-examples \
-	--disable-static-plugins \
-	\
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	--$(call ptx/endis, PTXCONF_GSTREAMER1_INTROSPECTION)-introspection \
 	\
 	--disable-gtk-doc \
 	--disable-gtk-doc-html \
 	--disable-gtk-doc-pdf \
 	--disable-gobject-cast-checks \
-	--disable-glib-asserts \
+	--disable-glib-asserts
+
+GSTREAMER1_GENERIC_CONF_OPT = \
+	$(GSTREAMER1_BASIC_CONF_OPT) \
+	\
+	--disable-nls \
+	--disable-rpath \
+	\
+	--disable-profiling \
+	--disable-valgrind \
+	--disable-gcov \
+	--disable-examples \
+	\
+	--enable-Bsymbolic \
+	--disable-static-plugins \
 	\
 	--without-libiconv-prefix \
 	--without-libintl-prefix \
+	--with-package-origin="PTXdist"
 
 GSTREAMER1_CONF_TOOL	:= autoconf
 GSTREAMER1_CONF_OPT	:= \
@@ -77,11 +83,12 @@ GSTREAMER1_CONF_OPT	:= \
 	--disable-benchmarks \
 	--$(call ptx/endis,PTXCONF_GSTREAMER1_INSTALL_TOOLS)-tools \
 	--disable-poisoning \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--$(call ptx/endis, PTXCONF_GSTREAMER1_INTROSPECTION)-introspection \
 	\
 	--disable-docbook \
 	\
 	--disable-check \
-	--enable-Bsymbolic \
 	--with-ptp-helper-setuid-user=nobody \
 	--with-ptp-helper-setuid-group=nogroup \
 	--with-ptp-helper-permissions=setuid-root