Attachment 200866 Details for Bug 233018 – Improved patch

[patch] Improved patch

unbreak_audio_oss_v2.svndiff (text/plain), 2.46 KB, created by Fernando Apesteguía on 2019-01-07 12:29:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2019-01-07 12:29:36 UTC

Size: 2.46 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revisiÃ³n: 489572)
>+++ Makefile	(copia de trabajo)
>@@ -12,17 +12,22 @@
> 
> 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
>Index: files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h
>===================================================================
>--- files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h	(nonexistent)
>+++ files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h	(copia de trabajo)
>@@ -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
>+ 
>
>Property changes on: files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-setup_srcconf__freebsd.inc
>===================================================================
>--- files/patch-setup_srcconf__freebsd.inc	(revisiÃ³n: 489572)
>+++ files/patch-setup_srcconf__freebsd.inc	(copia de trabajo)
>@@ -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
>  }

Actions: View | Diff

Attachments on bug 233018: 200844 | 200866