Don't check and then use an empty body. Don't use protected visibility,

it doesn't work the way the author believed here. Bump revision.

5 files changed, 77 insertions, 10 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 71900b4b812..4252a72149f 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.140 2016/04/19 10:41:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.141 2016/06/19 23:05:17 joerg Exp $
 
-PKGREVISION= 4
+PKGREVISION= 5
 .include "Makefile.common"
 
 COMMENT=		Multimedia player library
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 41717abbbc4..958b75b5a8c 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.105 2016/05/23 16:30:31 wiz Exp $
+$NetBSD: distinfo,v 1.106 2016/06/19 23:05:17 joerg Exp $
 
 SHA1 (xine-lib-1.2.6.tar.xz) = ac929eef2b7bf5c27699bbed612b953a01fccba5
 RMD160 (xine-lib-1.2.6.tar.xz) = 05edcd9a36e93d2fc9d1bf13cae3b32d4bd996da
 SHA512 (xine-lib-1.2.6.tar.xz) = ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
 Size (xine-lib-1.2.6.tar.xz) = 5020964 bytes
-SHA1 (patch-ag) = 108a626575cf4c9d964822cc879cf6868e0bbe24
+SHA1 (patch-ag) = e2eb9fdf9b7c013c3958c095edbfb09e6d1aedaf
 SHA1 (patch-cb) = 708ee946dd1708a40baef5ac193a46dc22bff8b5
+SHA1 (patch-contrib_libxdg-basedir_basedir.c) = 307900aadc912d9a4b71b602821bf7d6b27f3e0f
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
+SHA1 (patch-include_xine_attributes.h) = e7cb5f50d95a2523e2de83250fe11a12f0126a7f
 SHA1 (patch-include_xine_post.h) = 30629bff9486bf6b7ca889189cfad406eb242674
 SHA1 (patch-src-post-audio-stretch.c) = 6f950bcd47fdf68b691744dc105f59f821748ce1
 SHA1 (patch-src-post-audio-upmix.c) = 70ca6babfa9a7add0ac70a6024fcff429e1bc49d
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index c6aaf2b7abe..13360a8fd1f 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.28 2014/12/30 13:34:59 wiz Exp $
+$NetBSD: patch-ag,v 1.29 2016/06/19 23:05:17 joerg Exp $
 
 1. chunk:
 https://bugs.xine-project.org/show_bug.cgi?id=536
-2. chunk
+3. chunk
 https://bugs.xine-project.org/show_bug.cgi?id=531
 
---- configure.ac.orig	2012-06-09 17:30:18.000000000 +0000
-+++ configure.ac	2012-09-20 14:41:33.687892237 +0000
-@@ -9,7 +9,7 @@
+--- configure.ac.orig	2014-05-29 11:11:59.000000000 +0000
++++ configure.ac
+@@ -9,7 +9,7 @@ m4_esyscmd([./version.sh])
  
  dnl Initialize autoconf, autoheader, and automake
  AC_INIT([xine-lib], XINE_VERSION_SPEC, [xine-bugs@lists.sourceforge.net])
@@ -16,7 +16,17 @@ https://bugs.xine-project.org/show_bug.cgi?id=531
  AC_CONFIG_SRCDIR([src/xine-engine/xine.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_LIBOBJ_DIR([lib])
-@@ -905,6 +913,7 @@
+@@ -466,7 +466,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
+ CC_ATTRIBUTE_ALIGNED
+ 
+ CC_ATTRIBUTE_VISIBILITY([protected],
+-                        [visibility_export="protected"],
++                        [visibility_export="protected"
++                         CC_ATTRIBUTE_VISIBILITY([default])],
+                         [CC_ATTRIBUTE_VISIBILITY([default], [visibility_export="default"])])
+ CC_ATTRIBUTE_VISIBILITY([internal])
+ 
+@@ -920,6 +921,7 @@ AC_CHECK_FUNCS([strncasecmp _strnicmp], 
  
  AC_FUNC_FSEEKO
  
diff --git a/multimedia/xine-lib/patches/patch-contrib_libxdg-basedir_basedir.c b/multimedia/xine-lib/patches/patch-contrib_libxdg-basedir_basedir.c
new file mode 100644
index 00000000000..4d57502da0c
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-contrib_libxdg-basedir_basedir.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-contrib_libxdg-basedir_basedir.c,v 1.1 2016/06/19 23:05:17 joerg Exp $
+
+Fix empty body problems.
+
+--- contrib/libxdg-basedir/basedir.c.orig	2016-06-19 19:28:26.879811053 +0000
++++ contrib/libxdg-basedir/basedir.c
+@@ -143,14 +143,14 @@ static void xdgFreeStringList(char** lis
+ /** Free all data in the cache and set pointers to null. */
+ static void xdgFreeData(xdgCachedData *cache)
+ {
+-	if (cache->dataHome);
++	if (cache->dataHome)
+ 	{
+ 		/* the first element of the directory lists is usually the home directory */
+ 		if (cache->searchableDataDirectories[0] != cache->dataHome)
+ 			free(cache->dataHome);
+ 		cache->dataHome = 0;
+ 	}
+-	if (cache->configHome);
++	if (cache->configHome)
+ 	{
+ 		if (cache->searchableConfigDirectories[0] != cache->configHome)
+ 			free(cache->configHome);
+@@ -280,9 +280,9 @@ static char** xdgGetPathListEnv(const ch
+ 	else
+ 	{
+ 		if (!strings) return NULL;
+-		for (size = 0; strings[size]; ++size) ; ++size;
+-		if (!(itemlist = (char**)malloc(sizeof(char*)*size))) return NULL;
+-		xdgZeroMemory(itemlist, sizeof(char*)*(size));
++		for (size = 0; strings[size++];)
++			;
++		if (!(itemlist = calloc(sizeof(char*), size))) return NULL;
+ 
+ 		/* Copy defaults into itemlist. */
+ 		/* Why all this funky stuff? So the result can be handled uniformly by xdgFreeStringList. */
diff --git a/multimedia/xine-lib/patches/patch-include_xine_attributes.h b/multimedia/xine-lib/patches/patch-include_xine_attributes.h
new file mode 100644
index 00000000000..d6e2df8f5ae
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-include_xine_attributes.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-include_xine_attributes.h,v 1.1 2016/06/19 23:05:17 joerg Exp $
+
+Protected symbols must only be referenced as such in the defining DSO.
+xine is generally not prepared for that, so just use explicit default
+visibility.
+
+--- include/xine/attributes.h.orig	2016-06-19 19:53:49.487665526 +0000
++++ include/xine/attributes.h
+@@ -59,9 +59,7 @@
+ #endif
+ 
+ /* Export protected only for libxine functions */
+-#if defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY_PROTECTED)
+-# define XINE_PROTECTED __attribute__((__visibility__("protected")))
+-#elif defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY_DEFAULT)
++#if defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY_DEFAULT)
+ # define XINE_PROTECTED __attribute__((__visibility__("default")))
+ #else
+ # define XINE_PROTECTED