[libdmapsharing] Require libsoup 2.48.0

[W. Michael Petullo <wmpetullo src gnome org>]

commit 4d0ae4143d68a3794da21b0e3b9a2ef0f82b6af0
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun Feb 7 21:42:14 2016 +0000

    Require libsoup 2.48.0
    
    2.48 was released in September 2014, so should be in most distros by
    now.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=761690

 config.h.in                 |    9 ++++-----
 configure.ac                |   21 ++-------------------
 distro/libdmapsharing.spec  |    2 +-
 libdmapsharing/daap-share.c |    5 -----
 4 files changed, 7 insertions(+), 30 deletions(-)
---
diff --git a/config.h.in b/config.h.in
index 771a672..5413c06 100644
--- a/config.h.in
+++ b/config.h.in
@@ -15,9 +15,6 @@
 /* Define to 1 if you have the <dns_sd.h> header file. */
 #undef HAVE_DNS_SD_H
 
-/* Define if libsoup supports SOUP_ENCODING_EOF */
-#undef HAVE_ENCODING_EOF
-
 /* Define if gdk-pixbuf support is enabled */
 #undef HAVE_GDKPIXBUF
 
@@ -69,8 +66,7 @@
 /* Define the version */
 #undef LIBDMAPSHARING_VERSION
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Name of package */
@@ -108,3 +104,6 @@
 
 /* Define if mDNS/DNS-SD implementation uses Howl */
 #undef WITH_HOWL
+
+/* Defined when tests are to be built */
+#undef WITH_TESTS
diff --git a/configure.ac b/configure.ac
index 99ef5d9..ea2c8e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,7 +292,8 @@ AC_SUBST(MDNS_CFLAGS)
 AC_SUBST(MDNS_LIBS)
 
 dnl Check for libsoup, needed for DAAP and audioscrobbler
-PKG_CHECK_MODULES(SOUP, libsoup-2.4,
+dnl 2.48.0 is required so we can use the new SoupServer API.
+PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.48.0,
   HAVE_LIBSOUP=yes,
   HAVE_LIBSOUP=no)
 
@@ -310,24 +311,6 @@ fi
 AC_SUBST(SOUP_CFLAGS)
 AC_SUBST(SOUP_LIBS)
 
-dnl Check for libsoup again, this time >= 2.25.92, needed for HTTP 1.0
-PKG_CHECK_MODULES(SOUP_ENCODING_EOF, libsoup-2.4 >= 2.25.92,
-  HAVE_ENCODING_EOF=yes,
-  HAVE_ENCODING_EOF=no)
-
-if test x"$HAVE_ENCODING_EOF" = "xyes"; then
-  AC_DEFINE(HAVE_ENCODING_EOF, 1, [Define if libsoup supports SOUP_ENCODING_EOF])
-else
-  AC_WARN(Installed version of libsoup does not support)
-  AC_WARN(SOUP_ENCODING_EOF. HTTP 1.0 support will not be)
-  AC_WARN(built. Roku clients may be affected.)
-fi
-
-dnl Check for libsoup again, this time >= 2.32.2, needed for
-dnl DACP + Apple Remote App (actually 2.32) and IPv6 (tested 2.32.2)
-PKG_CHECK_MODULES(SOUP_APPLE_REMOTE_APP, libsoup-2.4 >= 2.32.2, ,
-  AC_WARN(Apple Remote App (DACP) and IPv6 may not work with libsoup < 2.32.2))
-
 dnl Check for GStreamer App, needed for transcoding
 dnl gstreamer-plugins-base >= 0.10.23.2 for GNOME Bugzilla #588205 & #587896.
 PKG_CHECK_MODULES(GSTREAMERAPP,
diff --git a/distro/libdmapsharing.spec b/distro/libdmapsharing.spec
index 5ce5f83..ccb0d67 100644
--- a/distro/libdmapsharing.spec
+++ b/distro/libdmapsharing.spec
@@ -6,7 +6,7 @@ Source: http://www.flyn.org/projects/libdmapsharing/%{name}-%{version}.tar.gz
 URL: http://www.flyn.org/projects/libdmapsharing/
 Summary: A DMAP client and server library
 Group: Development/Libraries
-BuildRequires: pkgconfig, glib2-devel, libsoup-devel >= 2.32 gobject-introspection-devel
+BuildRequires: pkgconfig, glib2-devel, libsoup-devel >= 2.48 gobject-introspection-devel
 BuildRequires: avahi-glib-devel, gdk-pixbuf2-devel, gstreamer1-plugins-base-devel
 
 %description 
diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c
index 430e029..0fc03eb 100644
--- a/libdmapsharing/daap-share.c
+++ b/libdmapsharing/daap-share.c
@@ -489,13 +489,8 @@ send_chunked_file (SoupServer * server, SoupMessage * message,
                soup_message_headers_set_content_length (message->response_headers, filesize);
        } else if (soup_message_get_http_version (message) == SOUP_HTTP_1_0) {
                /* NOTE: Roku clients support only HTTP 1.0. */
-#ifdef HAVE_ENCODING_EOF
                g_debug ("Using HTTP 1.0 encoding.");
                soup_message_headers_set_encoding (message->response_headers, SOUP_ENCODING_EOF);
-#else
-               g_warning ("Received HTTP 1.0 request, but not built with HTTP 1.0 support");
-               soup_message_headers_set_encoding (message->response_headers, SOUP_ENCODING_CHUNKED);
-#endif
        } else {
                /* NOTE: Can not provide Content-Length when performing
                 * real-time transcoding.