From owner-svn-ports-all@freebsd.org Tue Jul 24 14:00:51 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83C74104CA8C; Tue, 24 Jul 2018 14:00:51 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 355CA705F1; Tue, 24 Jul 2018 14:00:51 +0000 (UTC) (envelope-from danfe@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 16C1E47E3; Tue, 24 Jul 2018 14:00:51 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6OE0oAg053792; Tue, 24 Jul 2018 14:00:50 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6OE0oEf053791; Tue, 24 Jul 2018 14:00:50 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201807241400.w6OE0oEf053791@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 24 Jul 2018 14:00:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475256 - head/audio/deadbeef X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/audio/deadbeef X-SVN-Commit-Revision: 475256 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.27 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: Tue, 24 Jul 2018 14:00:51 -0000 Author: danfe Date: Tue Jul 24 14:00:50 2018 New Revision: 475256 URL: https://svnweb.freebsd.org/changeset/ports/475256 Log: Tentatively try to unbreak the build on arm* architectures. There were two kinds of problems: 1) Sloppy handling of 8-bit data and assuming that `char' is signed by default in AdPlug and Commodore 64 SID plugins code; 2) Incorrect detection of SSE2 support. Contrary to GCC, Clang always accepts `-msse2' command line option, even on !x86; it just tells that it won't be used. As a result, SSE2 code was compiled whilst it could not be, causing the build to fail. While here, remove no longer relevant patching of the configure script. Modified: head/audio/deadbeef/Makefile Modified: head/audio/deadbeef/Makefile ============================================================================== --- head/audio/deadbeef/Makefile Tue Jul 24 13:57:46 2018 (r475255) +++ head/audio/deadbeef/Makefile Tue Jul 24 14:00:50 2018 (r475256) @@ -220,9 +220,16 @@ post-patch: ${WRKSRC}/plugins/supereq/Makefile.in @${REINPLACE_CMD} -e 's,/etc/timidity++/timidity-freepats.cfg:/etc/timidity/freepats.cfg:/etc/timidity/,${LOCALBASE}/share/,' \ ${WRKSRC}/plugins/wildmidi/wildmidiplug.c - @${REINPLACE_CMD} \ - -e '/HAVE_OGG" = "yes"/ {n; n; /HAVE_VORBISPLUGIN=yes/d;}' \ +# Clang accepts `-msse2' command line option even on !x86, need better check + @${REINPLACE_CMD} -e '25177s,^,#include ,' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/chnresolv/s,const char,signed &,' \ + ${WRKSRC}/plugins/adplug/adplug/s3m.cpp \ + ${WRKSRC}/plugins/adplug/adplug/s3m.h + @${REINPLACE_CMD} -e "/sampleConvertTable/s,int8_t,u&, ; \ + 86,+1 { s,',,g; s,\\\\x,0x,g; }" \ + ${WRKSRC}/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp \ + ${WRKSRC}/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h # Fix build with libzip-1.0 @${REINPLACE_CMD} 's,zip_file_t,zip_file_DB,g' \ ${WRKSRC}/plugins/vfs_zip/vfs_zip.c