Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 10 Jun 2020 20:59:21 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r538439 - in head/multimedia/m2vrequantiser: . files
Message-ID:  <202006102059.05AKxLnw063166@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: pkubaj
Date: Wed Jun 10 20:59:21 2020
New Revision: 538439
URL: https://svnweb.freebsd.org/changeset/ports/538439

Log:
  multimedia/m2vrequantiser: fix build on powerpc* with clang, simplify port

Modified:
  head/multimedia/m2vrequantiser/Makefile
  head/multimedia/m2vrequantiser/files/patch-main.c

Modified: head/multimedia/m2vrequantiser/Makefile
==============================================================================
--- head/multimedia/m2vrequantiser/Makefile	Wed Jun 10 20:12:21 2020	(r538438)
+++ head/multimedia/m2vrequantiser/Makefile	Wed Jun 10 20:59:21 2020	(r538439)
@@ -10,10 +10,9 @@ DISTNAME=	M2VRequantiser-v${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Requantize MPEG-2 streams without recompressing
 
-PATCH_STRIP=	-p1
-CFLAGS+=	-Duint=unsigned
-MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
-PLIST_FILES+=	bin/M2VRequantiser
+CFLAGS=		-Duint=unsigned
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}"
+PLIST_FILES=	bin/M2VRequantiser
 
 post-patch:
 	${REINPLACE_CMD} 's|$$(PREFIX)|$${DESTDIR}$$(PREFIX)|' ${WRKSRC}/Makefile

Modified: head/multimedia/m2vrequantiser/files/patch-main.c
==============================================================================
--- head/multimedia/m2vrequantiser/files/patch-main.c	Wed Jun 10 20:12:21 2020	(r538438)
+++ head/multimedia/m2vrequantiser/files/patch-main.c	Wed Jun 10 20:59:21 2020	(r538439)
@@ -1,5 +1,14 @@
---- a/main.c
-+++ b/main.c
+--- main.c
++++ main.c
+@@ -30,7 +30,7 @@ Thanks to Sven Goethel for error resilience patches
+ #define NDEBUG // turns off asserts
+ #define REMOVE_BYTE_STUFFING	// removes series of 0x00
+ 
+-#if defined(__ppc__) || defined(__ppc64__)
++#if (defined(__ppc__) || defined(__ppc64__)) && !defined(__clang__)
+ 	#define USE_GLOBAL_REGISTER // assign registers to bit buffers
+ #elif defined(__i386__) || defined (__x86_64__)
+ 	// #define USE_GLOBAL_REGISTER // assign registers to bit buffers
 @@ -2315,7 +2315,7 @@ int main (int argc, const char * argv[])
  	if (argc < 5) { USAGE }
  	delta_bright = atoi(argv[4]);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006102059.05AKxLnw063166>