From e07e1f8ab31d34489556b70ece7ddb9ab6a7cf15 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 1 May 2017 05:18:55 +0200 Subject: [PATCH] libmms, update old bep file, created new patch file (#1311) --- media-libs/libmms/libmms-0.5.recipe | 70 +++++++++++++++---- media-libs/libmms/patches/libmms-0.5.patch | 40 ----------- media-libs/libmms/patches/libmms-0.5.patchset | 33 +++++++++ 3 files changed, 90 insertions(+), 53 deletions(-) delete mode 100644 media-libs/libmms/patches/libmms-0.5.patch create mode 100644 media-libs/libmms/patches/libmms-0.5.patchset diff --git a/media-libs/libmms/libmms-0.5.recipe b/media-libs/libmms/libmms-0.5.recipe index 254f125e3..54d012c3e 100644 --- a/media-libs/libmms/libmms-0.5.recipe +++ b/media-libs/libmms/libmms-0.5.recipe @@ -1,24 +1,68 @@ -DESCRIPTION="libmms - Common library for accessing Microsoft Media Server (MMS) media streaming protocol" +SUMMARY="A common library for parsing mms:// and mmsh:// type network streams" +DESCRIPTION="LibMMS is a common library for parsing mms:// and mmsh:// type \ +network streams. These are commonly used to stream Windows Media Video \ +content over the web. LibMMS itself is only for receiving MMS stream, it \ +doesn't handle sending at all." HOMEPAGE="https://launchpad.net/libmms" -SOURCE_URI="http://launchpad.net/libmms/trunk/0.5/+download/libmms-0.5.tar.gz" -CHECKSUM_MD5="cf83053ec891f14e73a04c84d9de08ee" +COPYRIGHT="2009 Xine project" +LICENSE="GNU LGPL v2.1" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/glib >= 2.0" +SOURCE_URI="http://launchpad.net/libmms/trunk/0.5/+download/libmms-0.5.tar.gz" +CHECKSUM_SHA256="02d9ca2b16b1517b84edb6c1c378a1f447679a831ba708a0396b30852aa6f091" +PATCHES="libmms-$portVersion.patchset" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + libmms$secondaryArchSuffix = $portVersion + lib:libmms$secondaryArchSuffix = 0.0.2 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libglib_2.0$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + " + +PROVIDES_devel=" + libmms${secondaryArchSuffix}_devel = $portVersion + devel:libmms$secondaryArchSuffix = 0.0.2 compat >= 0 + " +REQUIRES_devel=" + libmms$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libglib_2.0$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:awk + cmd:libtoolize$secondaryArchSuffix + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + " BUILD() { - cd libmms-0.5 - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + autoreconf -vfi + runConfigure ./configure + make $jobArgs } INSTALL() { - cd libmms-0.5 make install -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2009 Xine project" + rm $libDir/libmms.la + + prepareInstalledDevelLib libmms + fixPkgconfig + + packageEntries devel \ + $developDir +} diff --git a/media-libs/libmms/patches/libmms-0.5.patch b/media-libs/libmms/patches/libmms-0.5.patch deleted file mode 100644 index 6a310db53..000000000 --- a/media-libs/libmms/patches/libmms-0.5.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur libmms-0.5/configure.in libmms-0.5-haiku/configure.in ---- libmms-0.5/configure.in 2009-11-03 07:21:23.038273024 -0200 -+++ libmms-0.5-haiku/configure.in 2010-06-19 01:51:54.807141376 -0300 -@@ -3,6 +3,8 @@ - AM_CONFIG_HEADER([config.h src/mms_config.h]) - AC_CONFIG_SRCDIR(configure.in) - -+AC_CHECK_HEADERS(sys/select.h) -+ - AC_ISC_POSIX - AC_PROG_CC - AC_STDC_HEADERS -diff -Naur libmms-0.5/src/mms.c libmms-0.5-haiku/src/mms.c ---- libmms-0.5/src/mms.c 2009-11-03 07:18:02.033816576 -0200 -+++ libmms-0.5-haiku/src/mms.c 2010-06-19 01:51:10.941621248 -0300 -@@ -32,6 +32,10 @@ - #include "config.h" - #endif - -+#ifdef HAVE_SYS_SELECT_H -+#include -+#endif -+ - #include - #include - #include -diff -Naur libmms-0.5/src/mmsh.c libmms-0.5-haiku/src/mmsh.c ---- libmms-0.5/src/mmsh.c 2009-11-03 07:18:02.034078720 -0200 -+++ libmms-0.5-haiku/src/mmsh.c 2010-06-19 01:45:17.941621248 -0300 -@@ -34,6 +34,10 @@ - #include "config.h" - #endif - -+#ifdef HAVE_SYS_SELECT_H -+#include -+#endif -+ - #include - #include - #include diff --git a/media-libs/libmms/patches/libmms-0.5.patchset b/media-libs/libmms/patches/libmms-0.5.patchset new file mode 100644 index 000000000..141e8cca2 --- /dev/null +++ b/media-libs/libmms/patches/libmms-0.5.patchset @@ -0,0 +1,33 @@ +From addfcb224c6fae59bca353c0261d60b006454269 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 30 Apr 2017 16:59:12 +0200 +Subject: fix unknown type name 'fd_set' + + +diff --git a/src/mms.c b/src/mms.c +index 0884f6a..4946dfa 100644 +--- a/src/mms.c ++++ b/src/mms.c +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + + #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_CODESET) + #define USE_ICONV +diff --git a/src/mmsh.c b/src/mmsh.c +index cd5ef9b..0a26746 100644 +--- a/src/mmsh.c ++++ b/src/mmsh.c +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #define LOG_MODULE "mmsh" + #define LOG_VERBOSE +-- +2.7.0 +