From owner-svn-ports-all@freebsd.org Wed Jun 10 20:59:22 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6BDD133F939; Wed, 10 Jun 2020 20:59:22 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hzrB29Bhz4YYl; Wed, 10 Jun 2020 20:59:22 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B924CDB1; Wed, 10 Jun 2020 20:59:22 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05AKxMGf063167; Wed, 10 Jun 2020 20:59:22 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05AKxLnw063166; Wed, 10 Jun 2020 20:59:21 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202006102059.05AKxLnw063166@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 10 Jun 2020 20:59:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538439 - in head/multimedia/m2vrequantiser: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/multimedia/m2vrequantiser: . files X-SVN-Commit-Revision: 538439 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2020 20:59:22 -0000 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]);