Index: head/audio/oss/Makefile =================================================================== --- head/audio/oss/Makefile (revision 495530) +++ head/audio/oss/Makefile (revision 495531) @@ -1,109 +1,109 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= oss -DISTVERSION= 4.2-build2017 +DISTVERSION= 4.2-build2019 CATEGORIES= audio MASTER_SITES= http://www.opensound.com/developer/sources/stable/bsd/ DISTNAME= ${PORTNAME}-v${DISTVERSION}-src-bsd MAINTAINER= ports@FreeBSD.org 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= 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 SUB_FILES= pkg-install pkg-deinstall LLD_UNSAFE= yes KMODDIR= ${PREFIX}/lib/oss/modules OSS_CONF_FILES= oss_audigyls oss_audioloop oss_cs461x oss_emu10k1x \ oss_envy24 oss_envy24ht oss_fmedia oss_hdaudio \ oss_ich oss_imux oss_madi oss_midiloop oss_sblive \ oss_sbpci oss_sbxfi oss_trident oss_usb oss_userdev \ oss_ymf7xx osscore PROTO_DIR= ${INSTALL_WRKSRC}/prototype PROTO_ETCDIR= ${PROTO_DIR}/etc PROTO_BINDIR= ${PROTO_DIR}/usr/bin PROTO_SBINDIR= ${PROTO_DIR}/usr/sbin PROTO_MANDIR= ${PROTO_DIR}/usr/share/man PROTO_OSSLIBDIR=${PROTO_DIR}${PREFIX}/lib/oss OPTIONS_DEFINE= VORBIS OPTIONS_DEFAULT=VORBIS VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis VORBIS_CONFIGURE_ENV= OGG_SUPPORT=YES pre-patch: ${FIND} ${PATCH_WRKSRC} -name '*.man' -or \ \( -name '*.[ch]' \! -name ossmkdep.c \) | \ ${XARGS} ${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' \ -e 's|/etc/oss|${PREFIX}/etc/oss|g' post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/setup/srcconf.c ${FIND} ${PATCH_WRKSRC} -name configure -or \ -name make.local -or -name soundoff -or -name soundon | \ ${XARGS} ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' do-install: ${INSTALL_PROGRAM} ${PROTO_BINDIR}/* ${STAGEDIR}${PREFIX}/bin/ # @${ECHO_CMD} "OSSLIBDIR=${PREFIX}/lib/oss" > ${PROTO_ETCDIR}/oss.conf ${INSTALL_DATA} ${PROTO_ETCDIR}/oss.conf ${STAGEDIR}${PREFIX}/etc/ -@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss 2>/dev/null ${INSTALL_DATA} ${PROTO_OSSLIBDIR}/soundon.user \ ${STAGEDIR}${PREFIX}/lib/oss/soundon.user.sample ${INSTALL_DATA} ${PROTO_OSSLIBDIR}/sysfiles.list \ ${STAGEDIR}${PREFIX}/lib/oss/ ${INSTALL_DATA} ${PROTO_OSSLIBDIR}/version.dat \ ${STAGEDIR}${PREFIX}/lib/oss/ -@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss/conf 2>/dev/null .for CONF_FILE in ${OSS_CONF_FILES} ${INSTALL_DATA} ${PROTO_OSSLIBDIR}/conf/${CONF_FILE}.conf \ ${STAGEDIR}${PREFIX}/lib/oss/conf/${CONF_FILE}.conf.sample .endfor -@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss/etc 2>/dev/null ${INSTALL_DATA} ${PROTO_OSSLIBDIR}/etc/devices.list \ ${STAGEDIR}${PREFIX}/lib/oss/etc/ -@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss/include/sys 2>/dev/null ${INSTALL_DATA} ${PROTO_OSSLIBDIR}/include/sys/soundcard.h \ ${STAGEDIR}${PREFIX}/lib/oss/include/sys/ ${INSTALL_KLD} ${PROTO_OSSLIBDIR}/modules/*.ko ${STAGEDIR}${KMODDIR} ${INSTALL_MAN} ${PROTO_MANDIR}/man1/*.1.gz \ ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL_MAN} ${PROTO_MANDIR}/man7/*.7.gz \ ${STAGEDIR}${PREFIX}/man/man7/ ${INSTALL_MAN} ${PROTO_MANDIR}/man8/*.8.gz \ ${STAGEDIR}${PREFIX}/man/man8/ ${INSTALL_PROGRAM} ${PROTO_SBINDIR}/ossdetect \ ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_PROGRAM} ${PROTO_SBINDIR}/ossdevlinks \ ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_PROGRAM} ${PROTO_SBINDIR}/savemixer \ ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_SCRIPT} ${PROTO_SBINDIR}/soundoff \ ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_SCRIPT} ${PROTO_SBINDIR}/soundon \ ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_PROGRAM} ${PROTO_SBINDIR}/vmixctl \ ${STAGEDIR}${PREFIX}/sbin/ .include Index: head/audio/oss/distinfo =================================================================== --- head/audio/oss/distinfo (revision 495530) +++ head/audio/oss/distinfo (revision 495531) @@ -1,3 +1,3 @@ -TIMESTAMP = 1486110185 -SHA256 (oss-v4.2-build2017-src-bsd.tar.bz2) = 8ef2b1b964719b4c356de234d4b28832302027dc23bf636820be1afe1b099972 -SIZE (oss-v4.2-build2017-src-bsd.tar.bz2) = 1714709 +TIMESTAMP = 1552427700 +SHA256 (oss-v4.2-build2019-src-bsd.tar.bz2) = 3eaa2f66cc5f9cc66843eae9ae4601cf7206d00e7229d1f3144a122adea4e7c9 +SIZE (oss-v4.2-build2019-src-bsd.tar.bz2) = 1723557 Index: head/audio/oss/files/patch-setup_srcconf__freebsd.inc =================================================================== --- head/audio/oss/files/patch-setup_srcconf__freebsd.inc (revision 495530) +++ head/audio/oss/files/patch-setup_srcconf__freebsd.inc (nonexistent) @@ -1,14 +0,0 @@ ---- setup/srcconf_freebsd.inc.orig 2014-02-14 22:59:55 UTC -+++ setup/srcconf_freebsd.inc -@@ -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"); -+ "-O3 -fno-common -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding -mno-sse"); - # endif -+ fprintf(f, "\n"); - } Property changes on: head/audio/oss/files/patch-setup_srcconf__freebsd.inc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h =================================================================== --- head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h (revision 495530) +++ head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h (nonexistent) @@ -1,12 +0,0 @@ ---- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig 2019-01-12 19:57:42 UTC -+++ kernel/OS/FreeBSD/wrapper/bsddefs.h -@@ -91,6 +91,9 @@ typedef int ddi_iblock_cookie_t; - extern void oss_udelay (unsigned long t); - - #ifdef _KERNEL -+#ifdef memset -+#undef memset -+#endif - #define memset oss_memset - extern void *oss_memset (void *t, int val, int l); - #endif Property changes on: head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c =================================================================== --- head/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c (nonexistent) +++ head/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c (revision 495531) @@ -0,0 +1,18 @@ +--- kernel/OS/FreeBSD/os_freebsd.c.orig 2019-03-06 07:52:21 UTC ++++ kernel/OS/FreeBSD/os_freebsd.c +@@ -920,15 +920,9 @@ oss_poll (struct cdev *bsd_dev, int events, struct thr + return ev.revents; + } + +-#if defined(D_VERSION_03) && (D_VERSION == D_VERSION_03) + static int + oss_mmap (struct cdev *bsd_dev, vm_ooffset_t offset, vm_paddr_t * paddr, + int nprot, vm_memattr_t *memattr) +-#else +-static int +-oss_mmap (struct cdev *bsd_dev, vm_offset_t offset, vm_paddr_t * paddr, +- int nprot) +-#endif + { + int retval; + int dev; Property changes on: head/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c ___________________________________________________________________ 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:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property