From owner-svn-ports-head@freebsd.org Wed Jan 9 18:20:50 2019 Return-Path: Delivered-To: svn-ports-head@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 C043D1489848; Wed, 9 Jan 2019 18:20:50 +0000 (UTC) (envelope-from fernape@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) server-signature RSA-PSS (4096 bits) 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 5FD5B6D717; Wed, 9 Jan 2019 18:20:50 +0000 (UTC) (envelope-from fernape@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 39F601FB44; Wed, 9 Jan 2019 18:20:50 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x09IKojs095052; Wed, 9 Jan 2019 18:20:50 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x09IKniY095049; Wed, 9 Jan 2019 18:20:49 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <201901091820.x09IKniY095049@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Wed, 9 Jan 2019 18:20:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489819 - in head/audio/oss: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in head/audio/oss: . files X-SVN-Commit-Revision: 489819 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5FD5B6D717 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2019 18:20:51 -0000 Author: fernape Date: Wed Jan 9 18:20:49 2019 New Revision: 489819 URL: https://svnweb.freebsd.org/changeset/ports/489819 Log: audio/oss: unbreak in FreeBSD > 12 Unbreak port in FreeBSD 12 and 13-CURRENT. Broken most likely due to r335879. While here: * Add missing LIB_DEPENDS and USES for ossxmix * Reorder some variables PR: 233018 Reported by: sergey@akhmatov.ru Added: head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h (contents, props changed) Modified: head/audio/oss/Makefile head/audio/oss/files/patch-setup_srcconf__freebsd.inc Modified: head/audio/oss/Makefile ============================================================================== --- head/audio/oss/Makefile Wed Jan 9 18:13:04 2019 (r489818) +++ head/audio/oss/Makefile Wed Jan 9 18:20:49 2019 (r489819) @@ -12,17 +12,22 @@ COMMENT= Open Sound System from 4Front Technologies LICENSE= BSD2CLAUSE +ONLY_FOR_ARCHS= amd64 i386 + BUILD_DEPENDS= gawk:lang/gawk +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 -USES= tar:bzip2 kmod pkgconfig +USES= gnome tar:bzip2 kmod pkgconfig +USE_GNOME= gtk20 cairo gdkpixbuf2 +USE_RC_SUBR= oss + HAS_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes CONFIGURE_ENV= HOSTCC="${CC}" ALL_TARGET= all install -USE_GNOME= gtk20 -USE_RC_SUBR= oss + SUB_FILES= pkg-install pkg-deinstall -ONLY_FOR_ARCHS= amd64 i386 LLD_UNSAFE= yes KMODDIR= ${PREFIX}/lib/oss/modules Added: head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h Wed Jan 9 18:20:49 2019 (r489819) @@ -0,0 +1,13 @@ +--- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig 2019-01-06 18:38:02 UTC ++++ kernel/OS/FreeBSD/wrapper/bsddefs.h +@@ -91,7 +91,10 @@ typedef int ddi_iblock_cookie_t; + extern void oss_udelay (unsigned long t); + + #ifdef _KERNEL ++#ifdef memset ++#undef memset + #define memset oss_memset ++#endif + extern void *oss_memset (void *t, int val, int l); + #endif + Modified: head/audio/oss/files/patch-setup_srcconf__freebsd.inc ============================================================================== --- head/audio/oss/files/patch-setup_srcconf__freebsd.inc Wed Jan 9 18:13:04 2019 (r489818) +++ head/audio/oss/files/patch-setup_srcconf__freebsd.inc Wed Jan 9 18:20:49 2019 (r489819) @@ -5,6 +5,6 @@ # if defined(__x86_64__) fprintf (f, - "CFLAGS += -O3 -fno-common -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding\n"); -+ "CFLAGS += -O3 -fno-common -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding -mno-sse\n"); ++ "CFLAGS += -O3 -fno-common -DKLD_MODULE -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding -mno-sse\n"); # endif }