Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1586689745183450"
MIME-Version: 1.0
Date: Sun, 12 Apr 2020 11:09:05 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/multimedia/xine-lib
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20200412110905.ACF77FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1586689745183450
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sun Apr 12 11:09:05 UTC 2020

Modified Files:
	pkgsrc/multimedia/xine-lib: Makefile distinfo
Added Files:
	pkgsrc/multimedia/xine-lib/patches: patch-include_xine_xineutils.h

Log Message:
xine-lib: Don't try to reimplement memcpy. Should fix clang build.


To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 pkgsrc/multimedia/xine-lib/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/multimedia/xine-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/xine-lib/patches/patch-include_xine_xineutils.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1586689745183450
Content-Disposition: inline
Content-Length: 3148
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/multimedia/xine-lib/Makefile
diff -u pkgsrc/multimedia/xine-lib/Makefile:1.159 pkgsrc/multimedia/xine-lib/Makefile:1.160
--- pkgsrc/multimedia/xine-lib/Makefile:1.159	Thu Apr  2 17:46:40 2020
+++ pkgsrc/multimedia/xine-lib/Makefile	Sun Apr 12 11:09:05 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.159 2020/04/02 17:46:40 nia Exp $
+# $NetBSD: Makefile,v 1.160 2020/04/12 11:09:05 nia Exp $
 
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "Makefile.common"
 

Index: pkgsrc/multimedia/xine-lib/distinfo
diff -u pkgsrc/multimedia/xine-lib/distinfo:1.111 pkgsrc/multimedia/xine-lib/distinfo:1.112
--- pkgsrc/multimedia/xine-lib/distinfo:1.111	Thu Apr  2 15:52:46 2020
+++ pkgsrc/multimedia/xine-lib/distinfo	Sun Apr 12 11:09:05 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.111 2020/04/02 15:52:46 nia Exp $
+$NetBSD: distinfo,v 1.112 2020/04/12 11:09:05 nia Exp $
 
 SHA1 (xine-lib-1.2.10.tar.xz) = 66fe7a7d372f74967df46834167f85f5c2d43ae7
 RMD160 (xine-lib-1.2.10.tar.xz) = 1dba24e9e6c4f21e766d9b696dd02f4e645f4c8c
@@ -10,6 +10,7 @@ SHA1 (patch-contrib_libxdg-basedir_based
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
 SHA1 (patch-include_xine_attributes.h) = e7cb5f50d95a2523e2de83250fe11a12f0126a7f
 SHA1 (patch-include_xine_post.h) = 3ada327a7f171bdf680074b30f005099011a201c
+SHA1 (patch-include_xine_xineutils.h) = a8e32954433fcbd035dfe1416623c3e22ac754c2
 SHA1 (patch-src-post-audio-stretch.c) = 6f950bcd47fdf68b691744dc105f59f821748ce1
 SHA1 (patch-src-post-audio-upmix.c) = 70ca6babfa9a7add0ac70a6024fcff429e1bc49d
 SHA1 (patch-src-post-audio-upmix_mono.c) = 2c70ded10118cbeed5be3c948886f7311ddb7bbd

Added files:

Index: pkgsrc/multimedia/xine-lib/patches/patch-include_xine_xineutils.h
diff -u /dev/null pkgsrc/multimedia/xine-lib/patches/patch-include_xine_xineutils.h:1.1
--- /dev/null	Sun Apr 12 11:09:05 2020
+++ pkgsrc/multimedia/xine-lib/patches/patch-include_xine_xineutils.h	Sun Apr 12 11:09:05 2020
@@ -0,0 +1,36 @@
+$NetBSD: patch-include_xine_xineutils.h,v 1.1 2020/04/12 11:09:05 nia Exp $
+
+Don't reimplement memcpy. Actually not compatible with clang:
+
+../../include/xine/xineutils.h:211:63: error: fields must have a constant size:
+'variable length array in structure' extension will never be supported
+
+--- include/xine/xineutils.h.orig	2019-12-13 20:47:50.000000000 +0000
++++ include/xine/xineutils.h
+@@ -200,26 +200,6 @@ extern void *(* xine_fast_memcpy)(void *
+ /* len (usually) < 500, but not a build time constant. */
+ #define xine_small_memcpy(xsm_to,xsm_from,xsm_len) memcpy (xsm_to, xsm_from, xsm_len)
+ 
+-#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)
+-#  if defined(ARCH_X86)
+-#    undef xine_small_memcpy
+-static inline void *xine_small_memcpy (void *to, const void *from, size_t len) {
+-  void *t2 = to;
+-  size_t l2 = len;
+-  __asm__ __volatile__ (
+-    "cld\n\trep movsb"
+-    : "=S" (from), "=D" (t2), "=c" (l2), "=m" (*(struct {char foo[len];} *)to)
+-    : "0"  (from), "1"  (t2), "2"  (l2)
+-    : "cc"
+-  );
+-  (void)from;
+-  (void)t2;
+-  (void)l2;
+-  return to;
+-}
+-#  endif
+-#endif
+-
+ /*
+  * Debug stuff
+  */


--_----------=_1586689745183450--