summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorhans <hans>2011-10-12 17:30:22 +0000
committerhans <hans>2011-10-12 17:30:22 +0000
commitd2c51b3e6f73b7288e721dc8802ded5f3d2ce2fb (patch)
treeb2a16565da3065d22c87eea64140e0d7b1ef3eb9 /multimedia
parent41824fa664ef0195640af11a044b002eabdc9406 (diff)
downloadpkgsrc-d2c51b3e6f73b7288e721dc8802ded5f3d2ce2fb.tar.gz
Always add a dummy object to libxineposix.so. This is needed when all
features of libxineposix are supported natively and ar refuses create an empty library, and it shouldn't do any harm otherwise. Fixes build on OpenIndiana 151.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xine-lib/Makefile.common3
-rw-r--r--multimedia/xine-lib/distinfo4
-rw-r--r--multimedia/xine-lib/patches/patch-ag10
3 files changed, 13 insertions, 4 deletions
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 6ed1fad54ec..4756ee06716 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.67 2011/07/10 16:52:24 jmcneill Exp $
+# $NetBSD: Makefile.common,v 1.68 2011/10/12 17:30:22 hans Exp $
#
# used by audio/xine-arts/Makefile
@@ -63,6 +63,7 @@ BUILDLINK_TRANSFORM+= "rm:-Wl,--no-undefined"
.endif
pre-configure:
+ ${TOUCH} ${WRKSRC}/lib/dummy.c
cd ${WRKSRC} && autoheader
cd ${WRKSRC} && autoconf
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 573f779b9a6..8d756c54f21 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.73 2011/09/04 14:34:52 joerg Exp $
+$NetBSD: distinfo,v 1.74 2011/10/12 17:30:22 hans Exp $
SHA1 (xine-lib-1.1.19.tar.bz2) = 5afcc28c5cf2bdaab99d951960f6587797e1e5a0
RMD160 (xine-lib-1.1.19.tar.bz2) = 84999c43d3cc115c3bda4b2e06089dc827c646cc
Size (xine-lib-1.1.19.tar.bz2) = 7531642 bytes
SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
-SHA1 (patch-ag) = 201533ec8c94721147bdf572f3dd753c6b69c6bc
+SHA1 (patch-ag) = 96a2bab961ca90d7e3c1d67b6aa09388f9478d35
SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index e8869f1b68e..b47335dde9f 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.22 2011/07/10 16:52:25 jmcneill Exp $
+$NetBSD: patch-ag,v 1.23 2011/10/12 17:30:22 hans Exp $
--- configure.ac.orig 2010-07-25 14:37:30.000000000 +0000
+++ configure.ac
@@ -84,3 +84,11 @@ $NetBSD: patch-ag,v 1.22 2011/07/10 16:52:25 jmcneill Exp $
AC_DEFINE([HAVE_FREEBSD_CDROM], [1],
[Define 1 if you have FreeBSD CD-ROM support])
;;
+@@ -2234,6 +2255,7 @@ if test "x$some_snprintf" != "xyes" -o \
+ fi
+ AC_FUNC_FSEEKO
+ AC_CHECK_HEADERS(assert.h byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h netdb.h dirent.h sys/times.h sys/ioctl.h sys/param.h alloca.h)
++AC_LIBOBJ(dummy)
+ AC_REPLACE_FUNCS(asprintf basename gettimeofday setenv strcasestr strndup strpbrk strsep strtok_r timegm unsetenv memmem)
+
+ AC_LIBSOURCE(hstrerror.c)