[SCM] mediatomb/master: Remove unneeded patches.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Mon Sep 13 03:41:18 UTC 2010
The following commit has been merged in the master branch:
commit 3456e458344e34715855f1a677b62da04f7fb421
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun Sep 12 23:40:40 2010 -0400
Remove unneeded patches.
diff --git a/debian/patches/ffmpegthumbnailer-2.0.patch b/debian/patches/ffmpegthumbnailer-2.0.patch
deleted file mode 100644
index ccef51e..0000000
--- a/debian/patches/ffmpegthumbnailer-2.0.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-Upstream patch that allows mediatomb to be built with new ffmpegthumbnailer 2.0
-library
-==========================================================================
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -266,6 +266,7 @@
- # $1 with parameter/package name
- # $2 library name
- # $3 function name
-+# $4 "pass" if requested option failed
- #
- # returns:
- # mt_$1_library_status
-@@ -300,7 +301,12 @@
- mt_$1_ldflags="-L$mt_$1_search_libs"
- ],
- [
-- AC_MSG_ERROR([$1 library not found in requested location $mt_$1_search_libs])
-+ mt_$1_library_status=missing
-+ if test "$4" = "pass"; then
-+ AC_MSG_NOTICE([$1 library not found in requested location $mt_$1_search_libs])
-+ else
-+ AC_MSG_ERROR([$1 library not found in requested location $mt_$1_search_libs])
-+ fi
- ]
- )
- else
-@@ -418,6 +424,7 @@
- # $2 header name (without .h extension)
- # $3 library name
- # $4 function name
-+# $5 "pass" if requestd options failed
- #
- # returns:
- # mt_$1_package_status
-@@ -427,11 +434,11 @@
-
- AC_DEFUN([MT_CHECK_PACKAGE_INTERNAL],
- [
-- MT_CHECK_HEADER_INTERNAL([$1], [$2])
-+ MT_CHECK_HEADER_INTERNAL([$1], [$2], [$5])
- mt_$1_package_status=${mt_$1_header_status}
-
- if test "x$mt_$1_package_status" = xyes; then
-- MT_CHECK_LIBRARY_INTERNAL([$1], [$3], [$4])
-+ MT_CHECK_LIBRARY_INTERNAL([$1], [$3], [$4], [$5])
- mt_$1_package_status=${mt_$1_library_status}
- fi
-
-@@ -486,6 +493,7 @@
- # $4 header name (without .h)
- # $5 library name
- # $6 function name
-+# $7 "pass" on requested options
- # returns substed:
- # $1_STATUS
- # $1_LDFLAGS
-@@ -499,7 +507,7 @@
- MT_OPTION([$1], [$2], [$3],[],[])
-
- if test "x${translit($1, `a-z/.-', `A-Z___')_OPTION_ENABLED}" = xyes; then
-- MT_CHECK_PACKAGE_INTERNAL([$1], [$4], [$5], [$6])
-+ MT_CHECK_PACKAGE_INTERNAL([$1], [$4], [$5], [$6], [$7])
- mt_$1_status=${mt_$1_package_status}
- else
- mt_$1_status=disabled
-@@ -507,7 +515,7 @@
-
- if ((test "x${translit($1, `a-z/.-', `A-Z___')_OPTION_ENABLED}" = xyes) &&
- (test "x${translit($1, `a-z/.-', `A-Z___')_OPTION_REQUESTED}" = xyes) &&
-- (test "x$mt_$1_status" != xyes)); then
-+ (test "x$mt_$1_status" != xyes) && (test "$7" != "pass")); then
- AC_MSG_ERROR([unable to configure $1 support])
- fi
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1543,7 +1543,7 @@
- AC_SUBST(FFMPEG_LDFLAGS)
- AC_SUBST(FFMPEG_LIBS)
- else
-- if test "x$FFMPEG_OPTIEON_REQUESTED" = xyes; then
-+ if test "x$FFMPEG_OPTION_REQUESTED" = xyes; then
- AC_MSG_ERROR(unable to configure ffmpeg support)
- fi
- fi
-@@ -1551,8 +1551,19 @@
- MT_CHECK_OPTIONAL_PACKAGE([ffmpegthumbnailer], [disable],
- [compile with ffmpegthumbnailer support for video thumbnail generation],
- [libffmpegthumbnailer/videothumbnailerc],
-+ [ffmpegthumbnailer], [video_thumbnailer_create], [pass])
-+
-+if (test "x$FFMPEGTHUMBNAILER_STATUS" != xyes); then
-+ MT_CHECK_OPTIONAL_PACKAGE([ffmpegthumbnailer], [disable],
-+ [compile with ffmpegthumbnailer support for video thumbnail generation],
-+ [libffmpegthumbnailer/videothumbnailerc],
- [ffmpegthumbnailer], [create_thumbnailer])
-
-+ if (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes); then
-+ AC_DEFINE([FFMPEGTHUMBNAILER_OLD_API], [1], [use ffmpegthumbnailer API])
-+ fi
-+fi
-+
- if ((test "x$FFMPEG_STATUS" != xyes) && (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes)); then
- if test "x$FFMPEGTHUMBNAILER_OPTION_REQUESTED" = xyes; then
- AC_MSG_ERROR([ffmpeg libraries are required in order to use ffmpegthumbnailer])
---- a/src/metadata/ffmpeg_handler.cc
-+++ b/src/metadata/ffmpeg_handler.cc
-@@ -288,8 +288,14 @@
- if (!cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_ENABLED))
- return nil;
-
-+#ifdef FFMPEGTHUMBNAILER_OLD_API
- video_thumbnailer *th = create_thumbnailer();
- image_data *img = create_image_data();
-+#else
-+ video_thumbnailer *th = video_thumbnailer_create();
-+ image_data *img = video_thumbnailer_create_image_data();
-+#endif // old api
-+
-
- th->seek_percentage = cfg->getIntOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_SEEK_PERCENTAGE);
-
-@@ -302,14 +308,26 @@
- th->thumbnail_image_type = Jpeg;
-
- log_debug("Generating thumbnail for file: %s\n", item->getLocation().c_str());
-+
-+#ifdef FFMPEGTHUMBNAILER_OLD_API
- if (generate_thumbnail_to_buffer(th, item->getLocation().c_str(), img) != 0)
-- throw _Exception(_("Could not generate thumbnail for ") + item->getLocation());
-+#else
-+ if (video_thumbnailer_generate_thumbnail_to_buffer(th,
-+ item->getLocation().c_str(), img) != 0)
-+#endif // old api
-+ throw _Exception(_("Could not generate thumbnail for ") +
-+ item->getLocation());
-
- *data_size = (off_t)img->image_data_size;
- Ref<IOHandler> h(new MemIOHandler((void *)img->image_data_ptr,
- img->image_data_size));
-+#ifdef FFMPEGTHUMBNAILER_OLD_API
- destroy_image_data(img);
- destroy_thumbnailer(th);
-+#else
-+ video_thumbnailer_destroy_image_data(img);
-+ video_thumbnailer_destroy(th);
-+#endif// old api
- return h;
- #else
- return nil;
diff --git a/debian/patches/service-id_fix.patch b/debian/patches/service-id_fix.patch
deleted file mode 100644
index a2003fa..0000000
--- a/debian/patches/service-id_fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix wrong namespace in service-id attribute.
-==========================================================================
---- a/src/common.h
-+++ b/src/common.h
-@@ -146,14 +146,14 @@
- //services
- // connection manager
- #define DESC_CM_SERVICE_TYPE "urn:schemas-upnp-org:service:ConnectionManager:1"
--#define DESC_CM_SERVICE_ID "urn:schemas-upnp-org:serviceId:ConnectionManager"
-+#define DESC_CM_SERVICE_ID "urn:upnp-org:serviceId:ConnectionManager"
- #define DESC_CM_SCPD_URL "cm.xml"
- #define DESC_CM_CONTROL_URL "/upnp/control/cm"
- #define DESC_CM_EVENT_URL "/upnp/event/cm"
-
- // content directory
- #define DESC_CDS_SERVICE_TYPE "urn:schemas-upnp-org:service:ContentDirectory:1"
--#define DESC_CDS_SERVICE_ID "urn:schemas-upnp-org:serviceId:ContentDirectory"
-+#define DESC_CDS_SERVICE_ID "urn:upnp-org:serviceId:ContentDirectory"
- #define DESC_CDS_SCPD_URL "cds.xml"
- #define DESC_CDS_CONTROL_URL "/upnp/control/cds"
- #define DESC_CDS_EVENT_URL "/upnp/event/cds"
--
MediaTomb packaging
More information about the pkg-multimedia-commits
mailing list