GNOME.org
 

[gupnp-dlna/wip/gst-0.10] wip: Update for comments/1

commit 89f34dbd804d463c6da17112ea665d2650de8b3a
Author: Jens Georg <mail jensge org>
Date:   Mon Feb 11 16:12:56 2013 +0100

    wip: Update for comments/1

 configure.ac                                       |   26 ++++----
 libgupnp-dlna/Makefile.am                          |    4 +-
 .../metadata-backends/gstreamer-0.10/gstreamer.am  |   59 --------------------
 .../gstreamer-legacy/gstreamer.am                  |   59 ++++++++++++++++++++
 .../gupnp-dlna-gst-audio-information.c             |    0
 .../gupnp-dlna-gst-audio-information.h             |    0
 .../gupnp-dlna-gst-container-information.c         |    0
 .../gupnp-dlna-gst-container-information.h         |    0
 .../gupnp-dlna-gst-image-information.c             |    0
 .../gupnp-dlna-gst-image-information.h             |    0
 .../gupnp-dlna-gst-info-utils.c                    |    0
 .../gupnp-dlna-gst-info-utils.h                    |    0
 .../gupnp-dlna-gst-information.c                   |    0
 .../gupnp-dlna-gst-information.h                   |    0
 .../gupnp-dlna-gst-legacy-utils.h}                 |    0
 .../gupnp-dlna-gst-metadata-backend.c              |    0
 .../gupnp-dlna-gst-metadata-extractor.c            |    2 +-
 .../gupnp-dlna-gst-metadata-extractor.h            |    0
 .../gupnp-dlna-gst-utils.c                         |    2 +-
 .../gupnp-dlna-gst-video-information.c             |    0
 .../gupnp-dlna-gst-video-information.h             |    0
 vala/Makefile.am                                   |    2 +-
 22 files changed, 77 insertions(+), 77 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c913663..234f2ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,29 +111,29 @@ AC_ARG_ENABLE([legacy-gstreamer-metadata-backend],
 if test "x$enable_legacy_gstreamer_metadata_backend" != 'xno'
 then
         gstreamer_found='yes'
-        GST_MAJORMINOR=0.10
-        GST_REQ=0.10.36
-        GSTPBU_REQ=0.10.36
+        GST_LEGACY_MAJORMINOR=0.10
+        GST_LEGACY_REQ=0.10.36
+        GSTPBU_LEGACY_REQ=0.10.36
 
-        PKG_CHECK_MODULES([GST_010],
-                          [gstreamer-$GST_MAJORMINOR >= $GST_REQ],
+        PKG_CHECK_MODULES([GST_LEGACY],
+                          [gstreamer-$GST_LEGACY_MAJORMINOR >= $GST_LEGACY_REQ],
                           ,
                           [gstreamer_found='no'])
-        PKG_CHECK_MODULES([GST_PBU_010],
-                          [gstreamer-pbutils-$GST_MAJORMINOR >= $GSTPBU_REQ],
+        PKG_CHECK_MODULES([GST_PBU_LEGACY],
+                          [gstreamer-pbutils-$GST_LEGACY_MAJORMINOR >= $GSTPBU_LEGACY_REQ],
                           ,
                           [gstreamer_found='no'])
 
         if test "x$gstreamer_found" = 'xyes'
         then
-                AC_SUBST(GST_MAJORMINOR)
+                AC_SUBST(GST_LEGACY_MAJORMINOR)
 
-                GST_CFLAGS="$GST_CFLAGS -DGST_USE_UNSTABLE_API"
-                AC_SUBST(GST_CFLAGS)
+                GST_LEGACY_CFLAGS="$GST_LEGACY_CFLAGS -DGST_USE_UNSTABLE_API"
+                AC_SUBST(GST_LEGACY_CFLAGS)
                 enable_legacy_gstreamer_metadata_backend='yes'
         elif test "x$enable_legacy_gstreamer_metadata_backend" = 'xyes'
         then
-                AC_MSG_ERROR([GStreamer $GST_MAJORMINOR not found.])
+                AC_MSG_ERROR([GStreamer $GST_LEGACY_MAJORMINOR not found.])
         else
                 enable_legacy_gstreamer_metadata_backend='no'
         fi
@@ -141,9 +141,9 @@ fi
 
 if test "x$enable_legacy_gstreamer_metadata_backend" = 'xyes'
 then
-        AM_CONDITIONAL(GSTREAMER_010_METADATA_BACKEND_ENABLED, true)
+        AM_CONDITIONAL(GSTREAMER_LEGACY_METADATA_BACKEND_ENABLED, true)
 else
-        AM_CONDITIONAL(GSTREAMER_010_METADATA_BACKEND_ENABLED, false)
+        AM_CONDITIONAL(GSTREAMER_LEGACY_METADATA_BACKEND_ENABLED, false)
 fi
 
 AC_ARG_WITH([default-metadata-backend-dir],
diff --git a/libgupnp-dlna/Makefile.am b/libgupnp-dlna/Makefile.am
index c686e66..7b34825 100644
--- a/libgupnp-dlna/Makefile.am
+++ b/libgupnp-dlna/Makefile.am
@@ -66,8 +66,8 @@ if GSTREAMER_METADATA_BACKEND_ENABLED
 include $(top_srcdir)/libgupnp-dlna/metadata-backends/gstreamer/gstreamer.am
 endif
 
-if GSTREAMER_010_METADATA_BACKEND_ENABLED
-include $(top_srcdir)/libgupnp-dlna/metadata-backends/gstreamer-0.10/gstreamer.am
+if GSTREAMER_LEGACY_METADATA_BACKEND_ENABLED
+include $(top_srcdir)/libgupnp-dlna/metadata-backends/gstreamer-legacy/gstreamer.am
 endif
 
 noinst_LTLIBRARIES += \
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-legacy/gstreamer.am b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gstreamer.am
new file mode 100644
index 0000000..c7b4c54
--- /dev/null
+++ b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gstreamer.am
@@ -0,0 +1,59 @@
+gst_legacy_metadata_backend_libadd = \
+	$(common_libadd) \
+	$(GST_LEGACY_LIBS) \
+	$(GST_PBU_LEGACY_LIBS) \
+	libgupnp-dlna-2.0.la
+gst_legacy_metadata_backend_cflags = \
+	$(common_cflags) \
+	$(GST_LEGACY_CFLAGS) \
+	$(GST_PBU_LEGACY_CFLAGS) \
+	$(metadata_log_cflags) \
+	$(metadata_cflags)
+
+gstreamer_legacy_metadata_backend = \
+	metadata-backends/gstreamer-legacy/libgstreamer-legacy.la
+gstreamer_legacy_utils_lib = \
+	metadata-backends/gstreamer-legacy/libgupnp-dlna-gst-legacy-2.0.la
+metadata_LTLIBRARIES += \
+	$(gstreamer_legacy_metadata_backend)
+lib_LTLIBRARIES += \
+	$(gstreamer_legacy_utils_lib)
+
+metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_LDFLAGS = \
+	-no-undefined \
+	-shared -fPIC -module -avoid-version -Wl,-z,defs
+metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_SOURCES = \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-metadata-backend.c \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-metadata-extractor.c
+metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_LIBADD = \
+	$(gst_legacy_metadata_backend_libadd) \
+	$(gstreamer_legacy_utils_lib)
+metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_CFLAGS = \
+	$(gst_legacy_metadata_backend_cflags)
+
+metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_LDFLAGS = \
+	$(gupnp_ldflags)
+metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_SOURCES = \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-audio-information.c \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-container-information.c \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-image-information.c \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-information.c \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-info-utils.c \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-utils.c \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-video-information.c
+metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_LIBADD = \
+	$(gst_legacy_metadata_backend_libadd)
+metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_CFLAGS = \
+	$(gst_legacy_metadata_backend_cflags)
+
+dist_noinst_HEADERS += \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-audio-information.h \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-container-information.h \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-image-information.h \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-information.h \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-info-utils.h \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-metadata-extractor.h \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-video-information.h
+
+libgupnp_dlna_inc_HEADERS += \
+	metadata-backends/gstreamer-legacy/gupnp-dlna-gst-legacy-utils.h
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-audio-information.c b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-audio-information.c
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-audio-information.c
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-audio-information.c
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-audio-information.h b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-audio-information.h
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-audio-information.h
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-audio-information.h
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-container-information.c b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-container-information.c
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-container-information.c
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-container-information.c
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-container-information.h b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-container-information.h
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-container-information.h
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-container-information.h
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-image-information.c b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-image-information.c
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-image-information.c
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-image-information.c
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-image-information.h b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-image-information.h
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-image-information.h
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-image-information.h
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-info-utils.c b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-info-utils.c
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-info-utils.c
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-info-utils.c
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-info-utils.h b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-info-utils.h
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-info-utils.h
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-info-utils.h
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-information.c b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-information.c
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-information.c
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-information.c
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-information.h b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-information.h
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-information.h
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-information.h
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-0.10-utils.h b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-legacy-utils.h
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-0.10-utils.h
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-legacy-utils.h
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-metadata-backend.c b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-metadata-backend.c
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-metadata-backend.c
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-metadata-backend.c
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-metadata-extractor.c b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-metadata-extractor.c
similarity index 99%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-metadata-extractor.c
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-metadata-extractor.c
index c359f54..436e608 100644
--- a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-metadata-extractor.c
+++ b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-metadata-extractor.c
@@ -24,7 +24,7 @@
 #include <gst/pbutils/pbutils.h>
 #include "gupnp-dlna-gst-metadata-extractor.h"
 #include "gupnp-dlna-gst-information.h"
-#include "gupnp-dlna-gst-0.10-utils.h"
+#include "gupnp-dlna-gst-legacy-utils.h"
 
 G_DEFINE_TYPE (GUPnPDLNAGstMetadataExtractor,
                gupnp_dlna_gst_metadata_extractor,
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-metadata-extractor.h b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-metadata-extractor.h
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-metadata-extractor.h
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-metadata-extractor.h
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-utils.c b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-utils.c
similarity index 97%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-utils.c
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-utils.c
index 6ab0cb8..7f365ff 100644
--- a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-utils.c
+++ b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-utils.c
@@ -19,7 +19,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "gupnp-dlna-gst-0.10-utils.h"
+#include "gupnp-dlna-gst-legacy-utils.h"
 #include "gupnp-dlna-gst-information.h"
 
 /**
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-video-information.c b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-video-information.c
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-video-information.c
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-video-information.c
diff --git a/libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-video-information.h b/libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-video-information.h
similarity index 100%
rename from libgupnp-dlna/metadata-backends/gstreamer-0.10/gupnp-dlna-gst-video-information.h
rename to libgupnp-dlna/metadata-backends/gstreamer-legacy/gupnp-dlna-gst-video-information.h
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 1d501e5..0f06395 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -58,7 +58,7 @@ EXTRA_DIST += \
 	gupnp-dlna-gst-2.0-custom.vala
 endif
 
-if GSTREAMER_010_METADATA_BACKEND_ENABLED
+if GSTREAMER_LEGACY_METADATA_BACKEND_ENABLED
 vapi_DATA += \
 	gupnp-dlna-gst-0.10-2.0.vapi \
 	$(srcdir)/gupnp-dlna-gst-0.10-2.0.deps
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]