GNOME.org
 

[gstreamermm] remove plugins-bad module

commit 9798f4622b838f1d05f4b582482eba1c441dad60
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Sat Oct 21 12:24:01 2017 +0100

    remove plugins-bad module

 .gitignore                                         |    9 -
 Makefile.am                                        |    9 -
 configure.ac                                       |   18 +-
 examples/Makefile.am                               |   12 +-
 examples/opengl_filter/main.cc                     |  122 -
 examples/opengl_filter/sample_gl_filter.h          |   62 -
 .../gstreamermm-plugins-bad-uninstalled.pc.in      |   10 -
 gst-plugins-bad/gstreamermm-plugins-bad.h.in       |   14 -
 gst-plugins-bad/gstreamermm-plugins-bad.pc.in      |   19 -
 .../gstreamermm-plugins-bad/Makefile.am            |   33 -
 .../gstreamermm-plugins-bad/filelist.am            |    8 -
 .../gstreamermm-plugins-bad/private/.gitignore     |    1 -
 .../gstreamermm-plugins-bad/wrap_init.h            |   39 -
 gst-plugins-bad/src/Makefile.am                    |   24 -
 gst-plugins-bad/src/filelist.am                    |   20 -
 gst-plugins-bad/src/glbasefilter.ccg               |   20 -
 gst-plugins-bad/src/glbasefilter.hg                |   44 -
 gst-plugins-bad/src/glfilter.ccg                   |   40 -
 gst-plugins-bad/src/glfilter.hg                    |   82 -
 gst-plugins-bad/src/gst.defs                       |    3 -
 gst-plugins-bad/src/gst_docs.xml                   |11797 --------------------
 gst-plugins-bad/src/gst_enums.defs                 | 3562 ------
 gst-plugins-bad/src/gst_methods.defs               | 7266 ------------
 gst-plugins-bad/src/gst_vfuncs.defs                |   45 -
 tools/gen_scripts/generate_docs.sh                 |   13 -
 tools/gen_scripts/generate_enums.sh                |    6 -
 tools/gen_scripts/generate_methods.sh              |    5 -
 27 files changed, 2 insertions(+), 23281 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e54c80..e1bd153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -526,15 +526,6 @@ gstreamer/src/ximagesink.hg
 gstreamer/src/xvimagesink.ccg
 gstreamer/src/xvimagesink.hg
 
-#gst-plugins-bad/
-gst-plugins-bad/gstreamermm-plugins-bad.h
-gst-plugins-bad/gstreamermm-plugins-bad/glbasefilter.cc
-gst-plugins-bad/gstreamermm-plugins-bad/glbasefilter.h
-gst-plugins-bad/gstreamermm-plugins-bad/glfilter.cc
-gst-plugins-bad/gstreamermm-plugins-bad/glfilter.h
-gst-plugins-bad/gstreamermm-plugins-bad/wrap_init.cc
-gst-plugins-bad/gstreamermm-*.pc
-
 #tests/ gtest files
 tests/release-1.7.0.zip
 tests/gtest
diff --git a/Makefile.am b/Makefile.am
index cab5cd5..6581692 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,15 +41,6 @@ else
 doc_subdirs =
 endif
 
-if ENABLE_GSTREAMERMM_PLUGINS_BAD
-if MAINTAINER_MODE
-src_subdirs += gst-plugins-bad/src
-endif # MAINTAINER_MODE
-srcmm_subdirs += gst-plugins-bad/gstreamermm-plugins-bad
-pkgconfig_files += gst-plugins-bad/$(GSTREAMERMM_PLUGINS_BAD_MODULE_NAME).pc
-gstreamermm_include_HEADERS += gst-plugins-bad/gstreamermm-plugins-bad.h
-endif #ENABLE_PLUGINS_BAD
-
 SUBDIRS = tools $(src_subdirs) $(srcmm_subdirs) \
           tests examples $(doc_subdirs)
 
diff --git a/configure.ac b/configure.ac
index 5d354f2..c846957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,11 +23,10 @@ AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([gstreamer/gstreamermm.h])
 AC_CONFIG_AUX_DIR([build])
 AC_CONFIG_MACRO_DIR([build])
-AC_CONFIG_HEADERS([config.h gstreamer/gstreamermmconfig.h gst-plugins-bad/gstreamermm-plugins-bad.h])
+AC_CONFIG_HEADERS([config.h gstreamer/gstreamermmconfig.h])
 
 MM_PREREQ([0.9.8])
 MM_INIT_MODULE([gstreamermm-1.0])
-MM_INIT_MODULE([gstreamermm-plugins-bad-1.0])
 
 # Copy the mm-common .pl scripts into docs/,
 # and use them from there,
@@ -57,7 +56,6 @@ AC_PROG_SED
 AS_IF([test "x$enable_static" = xyes],
 [
   AC_DEFINE([GSTREAMERMM_STATIC_LIB], [1], [Define if gstreamermm is built as a static library])
-  AC_DEFINE([GSTREAMERMM_PLUGINS_BAD_STATIC_LIB], [1], [Define if gstreamermm-plugins-bad is built as a 
static library])
 ])
 
 # The format below is used so that the requirements appear nicely in the .pc
@@ -73,13 +71,6 @@ AC_SUBST([GSTREAMERMM_MODULES],
 
 PKG_CHECK_MODULES([GSTREAMERMM], [$GSTREAMERMM_MODULES])
 
-AC_SUBST([GSTREAMERMM_PLUGINS_BAD_MODULES],
-         ["gstreamer-plugins-bad-1.0 >= GSTMM_VERSION gstreamermm-1.0 >= GSTMM_VERSION"])
-
-FIND_GST_MODULE(GSTREAMERMM_PLUGINS_BAD, plugins-bad, plugins_bad)
-FIND_GST_MODULE(GSTREAMERMM_GL, gl, gl, $gstmm_enable_plugins_bad)
-ADD_MODULE_CONDITIONALLY([GSTREAMERMM_PLUGINS_BAD_MODULES], [gstreamer-gl-1.0], [$gstmm_enable_gl])
-
 PKG_CHECK_MODULES([GUI_EXAMPLES], [$GSTREAMERMM_MODULES gtkmm-3.0 >= 3.0],
                   [gstmm_enable_gui_examples=yes], [gstmm_enable_gui_examples=no])
 
@@ -217,10 +208,6 @@ AC_CONFIG_FILES([Makefile
                  gstreamer/${GSTREAMERMM_MODULE_NAME}-uninstalled.pc:gstreamer/gstreamermm-uninstalled.pc.in
                  gstreamer/src/Makefile
                  gstreamer/gstreamermm/Makefile
-                 
gst-plugins-bad/${GSTREAMERMM_PLUGINS_BAD_MODULE_NAME}.pc:gst-plugins-bad/gstreamermm-plugins-bad.pc.in
-                 
gst-plugins-bad/${GSTREAMERMM_PLUGINS_BAD_MODULE_NAME}-uninstalled.pc:gst-plugins-bad/gstreamermm-plugins-bad-uninstalled.pc.in
-                 gst-plugins-bad/src/Makefile
-                 gst-plugins-bad/gstreamermm-plugins-bad/Makefile
                  examples/Makefile
                  tests/Makefile
                  docs/Makefile
@@ -236,9 +223,6 @@ ${PACKAGE}-${VERSION}
 
   Libraries
     GStreamer Version:           $(pkg-config --modversion gstreamer-1.0)
-    gstreamer-plugins-bad:       ${gstmm_enable_plugins_bad} ${gstmm_plugins_bad_version}
-        gstreamer-gl:            ${gstmm_enable_gl}
-
 
   Extra features
     Use deprecated API:          ${mm_enable_deprecated_api}
diff --git a/examples/Makefile.am b/examples/Makefile.am
index b16de4e..dfceea3 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -15,7 +15,7 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-examples_cppflags = $(GSTREAMERMM_CFLAGS) $(GSTREAMERMM_PLUGINS_BAD_CFLAGS) $(GSTREAMERMM_GL_CFLAGS)
+examples_cppflags = $(GSTREAMERMM_CFLAGS) $(GSTREAMERMM_GL_CFLAGS)
 gstreamermm_includes = -I$(top_builddir)/gstreamer $(if $(srcdir:.=),-I$(top_srcdir)/gstreamer) 
 local_libgstreamermm = $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-$(GSTREAMERMM_API_VERSION).la
 
@@ -34,16 +34,6 @@ ogg_player_gtkmm_example_SOURCES                     = ogg_player_gtkmm/main.cc \
 ogg_player_gtkmm_example_LDADD                         = $(GUI_EXAMPLES_LIBS) $(local_libgstreamermm)
 endif
 
-if ENABLE_GSTREAMERMM_PLUGINS_BAD
-gstreamermm_includes += -I$(top_builddir)/gst-plugins-bad $(if $(srcdir:.=),-I$(top_srcdir)/gst-plugins-bad)
-local_libgstreamermm += 
$(top_builddir)/gst-plugins-bad/gstreamermm-plugins-bad/libgstreamermm-plugins-bad-$(GSTREAMERMM_API_VERSION).la
-endif
-
-if ENABLE_GSTREAMERMM_GL
-gl_examples = opengl_filter/example
-local_libgstreamermm += $(GSTREAMERMM_GL_LIBS)
-endif
-
 noinst_PROGRAMS =                                              \
        all_media_player/example                        \
        audio_video_muxer/example                       \
diff --git a/tools/gen_scripts/generate_docs.sh b/tools/gen_scripts/generate_docs.sh
index 361bc58..af7bbcb 100755
--- a/tools/gen_scripts/generate_docs.sh
+++ b/tools/gen_scripts/generate_docs.sh
@@ -24,16 +24,3 @@ done
 
 DOCEXTRACT_TO_XML_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/docextract_to_xml.py"
 $DOCEXTRACT_TO_XML_PY --no-since $PARAMS > "$OUT_DIR/gst_docs.xml"
-
-
-OUT_DIR="$ROOT_DIR/gst-plugins-bad/src"
-PARAMS=""
-
-for dir in "$PREFIX"/gst-plugins-bad/gst-libs/gst/{adaptivedemux,base,\
-basecamerabinsrc,codecparsers,gl,insertbin,interfaces,mpegts,\
-uridownloader,video,wayland}; do
-  PARAMS="$PARAMS -s $dir"
-done
-
-DOCEXTRACT_TO_XML_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/docextract_to_xml.py"
-$DOCEXTRACT_TO_XML_PY --no-since $PARAMS > "$OUT_DIR/gst_docs.xml"
diff --git a/tools/gen_scripts/generate_enums.sh b/tools/gen_scripts/generate_enums.sh
index d442ec1..451720a 100755
--- a/tools/gen_scripts/generate_enums.sh
+++ b/tools/gen_scripts/generate_enums.sh
@@ -27,10 +27,4 @@ interfaces,netbuffer,pbutils,riff,rtp,rtsp,sdp,tag,video}/*.h \
 #Patch generated file.
 patch $OUT_DIR/gst_enums.defs $OUT_DIR/gst_enums.defs.patch
 
-OUT_DIR="$ROOT_DIR/gst-plugins-bad/src"
-PREFIX="$JHBUILD_SOURCES/gst-plugins-bad"
-$ENUM_PL  "$PREFIX"/gst-libs/gst/{adaptivedemux,base,basecamerabinsrc,\
-codecparsers,gl,insertbin,interfaces,mpegts,uridownloader,video,wayland}/*.h > \
-"$OUT_DIR/gst_enums.defs"
-
 
diff --git a/tools/gen_scripts/generate_methods.sh b/tools/gen_scripts/generate_methods.sh
index c18539b..6e073c8 100755
--- a/tools/gen_scripts/generate_methods.sh
+++ b/tools/gen_scripts/generate_methods.sh
@@ -28,9 +28,4 @@ $H2DEF_PY  "$PREFIX"/gst-libs/gst/{allocators,app,audio,cdda,fft,floatcast,\
 interfaces,netbuffer,pbutils,riff,rtp,rtsp,sdp,tag,video}/*.h >> \
 "$OUT_DIR/gst_methods.defs"
 
-OUT_DIR="$ROOT_DIR/gst-plugins-bad/src"
-PREFIX="$JHBUILD_SOURCES/gst-plugins-bad"
-$H2DEF_PY  "$PREFIX"/gst-libs/gst/{adaptivedemux,base,basecamerabinsrc,\
-codecparsers,gl,insertbin,interfaces,mpegts,uridownloader,video,wayland}/*.h > \
-"$OUT_DIR/gst_methods.defs"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]