[grilo-plugins] plugins: Remove UPnP plugin



commit 1f7e27cbcd50c546010952bcc815b66ebffd3d94
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jul 16 12:51:18 2014 +0200

    plugins: Remove UPnP plugin
    
    It's been replaced by the DLeyna-based plugin
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733253

 Makefile.am               |    1 -
 configure.ac              |   53 --
 help/C/grilo-plugins.xml  |    5 -
 po/POTFILES.in            |    1 -
 src/Makefile.am           |    6 +-
 src/upnp/Makefile.am      |   47 --
 src/upnp/grl-upnp-utils.c |  399 ------------
 src/upnp/grl-upnp-utils.h |   34 -
 src/upnp/grl-upnp.c       | 1576 ---------------------------------------------
 src/upnp/grl-upnp.h       |   75 ---
 src/upnp/grl-upnp.xml     |   10 -
 11 files changed, 1 insertions(+), 2206 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index eb70c9d..3113453 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-apple-trailers \
                             --enable-thetvdb \
                             --enable-tmdb \
                             --enable-tracker \
-                            --enable-upnp \
                             --enable-vimeo \
                             --enable-youtube
 
diff --git a/configure.ac b/configure.ac
index a0b437b..aeea90a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,10 +124,6 @@ PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0, HAVE_GIO_UNIX=yes, HAVE_GIO_UNIX=no)
 
 PKG_CHECK_MODULES(GSSDP, gssdp-1.0, HAVE_GSSDP=yes, HAVE_GSSDP=no)
 
-PKG_CHECK_MODULES(GUPNP, gupnp-1.0 >= 0.13, HAVE_GUPNP=yes, HAVE_GUPNP=no)
-
-PKG_CHECK_MODULES(GUPNPAV, gupnp-av-1.0 >= 0.5, HAVE_GUPNPAV=yes, HAVE_GUPNPAV=no)
-
 PKG_CHECK_MODULES(DMAP, libdmapsharing-3.0 >= 2.9.12, HAVE_DMAP=yes, HAVE_DMAP=no)
 
 PKG_CHECK_MODULES(SQLITE, sqlite3, HAVE_SQLITE=yes, HAVE_SQLITE=no)
@@ -413,54 +409,6 @@ DEPS_LASTFM_ALBUMART_LIBS="$DEPS_LIBS $GRLNET_LIBS $XML_LIBS"
 AC_SUBST(DEPS_LASTFM_ALBUMART_LIBS)
 
 # ----------------------------------------------------------
-# BUILD UPNP PLUGIN
-# ----------------------------------------------------------
-
-AC_ARG_ENABLE(upnp,
-        AC_HELP_STRING([--enable-upnp],
-                [enable uPnP plugin (default: auto)]),
-        [
-                case "$enableval" in
-                     yes)
-                        if test "x$HAVE_GSSDP" = "xno"; then
-                           AC_MSG_ERROR([gssdp-1.0 not found, install it or use --disable-upnp])
-                        fi
-                        if test "x$HAVE_GUPNP" = "xno"; then
-                           AC_MSG_ERROR([gupnp-1.0 >= 0.13 not found, install it or use --disable-upnp])
-                        fi
-                        if test "x$HAVE_GUPNPAV" = "xno"; then
-                           AC_MSG_ERROR([gupnp-av-1.0 >= 0.5 not found, install it or use --disable-upnp])
-                        fi
-                        if test "$xHAVE_XML" = "xno"; then
-                           AC_MSG_ERROR([libxml-2.0 not found, install it or use --disable-upnp])
-                        fi
-                esac
-        ],
-        [
-                if test "x$HAVE_GSSDP" = "xyes" -a "x$HAVE_GUPNP" = "xyes" -a "x$HAVE_GUPNPAV" = "xyes" -a 
"x$HAVE_XML" = "xyes"; then
-                        enable_upnp=yes
-                else
-                        enable_upnp=no
-                fi
-        ])
-
-AM_CONDITIONAL([UPNP_PLUGIN], [test "x$enable_upnp" = "xyes"])
-GRL_PLUGINS_ALL="$GRL_PLUGINS_ALL upnp"
-if test "x$enable_upnp" = "xyes"
-then
-       GRL_PLUGINS_ENABLED="$GRL_PLUGINS_ENABLED upnp"
-fi
-
-UPNP_PLUGIN_ID="grl-upnp"
-AC_SUBST(UPNP_PLUGIN_ID)
-AC_DEFINE_UNQUOTED([UPNP_PLUGIN_ID], ["$UPNP_PLUGIN_ID"], [UPnP plugin ID])
-
-DEPS_UPNP_CFLAGS="$DEPS_CFLAGS $GSSDP_CFLAGS $GUPNP_CFLAGS $GUPNPAV_CFLAGS $GTHREAD_CFLAGS $XML_CFLAGS"
-AC_SUBST(DEPS_UPNP_CFLAGS)
-DEPS_UPNP_LIBS="$DEPS_LIBS $GSSDP_LIBS $GUPNP_LIBS $GUPNPAV_LIBS $GTHREAD_LIBS $XML_LIBS"
-AC_SUBST(DEPS_UPNP_LIBS)
-
-# ----------------------------------------------------------
 # BUILD YOUTUBE PLUGIN
 # ----------------------------------------------------------
 
@@ -1460,7 +1408,6 @@ AC_CONFIG_FILES([
   src/shoutcast/Makefile
   src/tmdb/Makefile
   src/tracker/Makefile
-  src/upnp/Makefile
   src/vimeo/Makefile
   src/youtube/Makefile
   tests/Makefile
diff --git a/help/C/grilo-plugins.xml b/help/C/grilo-plugins.xml
index 3d44b35..ee3d710 100644
--- a/help/C/grilo-plugins.xml
+++ b/help/C/grilo-plugins.xml
@@ -151,11 +151,6 @@
 <para>This is a Grilo plugin for Tracker. Its plugin ID is <literal>"grl-tracker"</literal></para>
 </sect1>
 
-<sect1 id="sec-plugin-upnp">
-<title>UPnP</title>
-<para>This is a Grilo plugin for UPnP. Its plugin ID is <literal>"grl-upnp"</literal></para>
-</sect1>
-
 <sect1 id="sec-plugin-vimeo">
 <title>Vimeo</title>
 <para>This is a Grilo plugin for Vimeo. Its plugin ID is <literal>"grl-vimeo"</literal></para>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 29e23bf..9f7a9b7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,6 +24,5 @@ src/tracker/grl-tracker.c
 src/tracker/grl-tracker-source-api.c
 src/tracker/grl-tracker-source-priv.h
 src/tracker/grl-tracker-utils.c
-src/upnp/grl-upnp.c
 src/vimeo/grl-vimeo.c
 src/youtube/grl-youtube.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 746ccd8..368b965 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -98,10 +98,6 @@ if TRACKER_PLUGIN
 SUBDIRS += tracker
 endif
 
-if UPNP_PLUGIN
-SUBDIRS += upnp
-endif
-
 if VIMEO_PLUGIN
 SUBDIRS += vimeo
 endif
@@ -117,7 +113,7 @@ endif
 DIST_SUBDIRS = \
    apple-trailers bliptv bookmarks dleyna dmap filesystem flickr freebox gravatar jamendo \
    lastfm-albumart local-metadata lua-factory magnatune metadata-store optical-media   \
-   pocket podcasts raitv shoutcast thetvdb tmdb tracker upnp vimeo youtube
+   pocket podcasts raitv shoutcast thetvdb tmdb tracker vimeo youtube
 
 MAINTAINERCLEANFILES = \
         *.in           \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]