Date: Wed, 9 Jan 2019 18:20:49 +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-head@freebsd.org Subject: svn commit: r489819 - in head/audio/oss: . files Message-ID: <201901091820.x09IKniY095049@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901091820.x09IKniY095049>