Date: Tue, 15 Jan 2019 21:28:27 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r490428 - in branches/2019Q1/audio/oss: . files Message-ID: <201901152128.x0FLSRCW032705@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Tue Jan 15 21:28:27 2019 New Revision: 490428 URL: https://svnweb.freebsd.org/changeset/ports/490428 Log: MFH: r489819 r490082 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 Approved by: ports-secteam (miwi) Added: branches/2019Q1/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h - copied, changed from r489819, head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h Modified: branches/2019Q1/audio/oss/Makefile branches/2019Q1/audio/oss/files/patch-setup_srcconf__freebsd.inc Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/audio/oss/Makefile ============================================================================== --- branches/2019Q1/audio/oss/Makefile Tue Jan 15 21:20:25 2019 (r490427) +++ branches/2019Q1/audio/oss/Makefile Tue Jan 15 21:28:27 2019 (r490428) @@ -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 Copied and modified: branches/2019Q1/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h (from r489819, head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h) ============================================================================== --- head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h Wed Jan 9 18:20:49 2019 (r489819, copy source) +++ branches/2019Q1/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h Tue Jan 15 21:28:27 2019 (r490428) @@ -1,13 +1,12 @@ ---- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig 2019-01-06 18:38:02 UTC +--- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig 2019-01-12 19:57:42 UTC +++ kernel/OS/FreeBSD/wrapper/bsddefs.h -@@ -91,7 +91,10 @@ typedef int ddi_iblock_cookie_t; +@@ -91,6 +91,9 @@ typedef int ddi_iblock_cookie_t; extern void oss_udelay (unsigned long t); #ifdef _KERNEL +#ifdef memset +#undef memset - #define memset oss_memset +#endif + #define memset oss_memset extern void *oss_memset (void *t, int val, int l); #endif - Modified: branches/2019Q1/audio/oss/files/patch-setup_srcconf__freebsd.inc ============================================================================== --- branches/2019Q1/audio/oss/files/patch-setup_srcconf__freebsd.inc Tue Jan 15 21:20:25 2019 (r490427) +++ branches/2019Q1/audio/oss/files/patch-setup_srcconf__freebsd.inc Tue Jan 15 21:28:27 2019 (r490428) @@ -1,10 +1,14 @@ --- setup/srcconf_freebsd.inc.orig 2014-02-14 22:59:55 UTC +++ setup/srcconf_freebsd.inc -@@ -12,6 +12,6 @@ add_kernel_flags (FILE * f) +@@ -10,8 +10,10 @@ check_sysdep (conf_t * conf, struct utsname *un) + static void + add_kernel_flags (FILE * f) { ++ fprintf (f, "CFLAGS += -DKLD_MODULE "); # 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"); ++ "-O3 -fno-common -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding -mno-sse"); # endif ++ fprintf(f, "\n"); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901152128.x0FLSRCW032705>