*/*: sync with upstream

Taken from: HardenedBSD
opnsense2 · Jun 22, 2018 · 7efd253 · 7efd253
1 parent 22c445b
commit 7efd253
Show file tree

Hide file tree

Showing 333 changed files with 2,360 additions and 1,227 deletions.
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kmousetool
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde kde-applications
 
 MAINTAINER=	[email protected]

diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
@@ -13,6 +13,10 @@ COMMENT=	Software for describing astronomical images
 
 LICENSE=	GPLv2
 
+BROKEN_aarch64=		fails to link: os-features-test.c:10: undefined symbol 'canonicalize_file_name'
+BROKEN_armv6=		fails to link: os-features-test.c:10: undefined symbol 'canonicalize_file_name'
+BROKEN_armv7=		fails to link: os-features-test.c:10: undefined symbol 'canonicalize_file_name'
+
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libcfitsio.so:astro/cfitsio \
@@ -27,7 +31,7 @@ ALL_TARGET=	all extra
 MAKE_ENV=	INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME}
 MAKE_JOBS_UNSAFE=	yes
 SUB_FILES=	pkg-message
-LDFLAGS=	-lz
+LDFLAGS+=	-lz
 
 post-patch:
 	@${REINPLACE_CMD} -E 's,python (setup|-c),${PYTHON_CMD} \1,' \

diff --git a/astro/boinc-setiathome/Makefile b/astro/boinc-setiathome/Makefile
@@ -14,7 +14,11 @@ COMMENT=	Setiathome Enhanced for BOINC
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_powerpc64=	does not compile: analyzeFuncs_altivec.cpp: CoreServices/CoreServices.h: No such file or directory
+BROKEN_aarch64=		fails to link: vector/analyzeFuncs_vector.cpp:(.data+0x38): undefined symbol 'vfp_GetPowerSpectrum(float (*) [2], float*, int)'
+BROKEN_armv6=		fails to compile: vector/analyzeFuncs_neon.S:178:17: invalid instruction, did you mean: neg?
+BROKEN_armv7=		fails to compile: vector/analyzeFuncs_neon.S:178:17: invalid instruction, did you mean: neg?
+BROKEN_powerpc64=	fails to compile: analyzeFuncs_altivec.cpp: CoreServices/CoreServices.h: No such file or directory
+
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 RUN_DEPENDS=	boinc_client:net/boinc-client
 LIB_DEPENDS=	libfftw3f.so:math/fftw3-float

diff --git a/astro/libkgeomap-kde4/Makefile b/astro/libkgeomap-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libkgeomap
 PORTVERSION=	${KDE4_APPLICATIONS_VERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4

diff --git a/astro/marble-kde4/Makefile b/astro/marble-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	marble
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro kde kde-kde4
 
 MAINTAINER=	[email protected]

diff --git a/astro/marble/Makefile b/astro/marble/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	marble
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	astro kde kde-applications
 
 MAINTAINER=	[email protected]

diff --git a/astro/stellarium-qt4/Makefile b/astro/stellarium-qt4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	stellarium
 PORTVERSION=	0.12.9
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/Stellarium-sources/${PORTVERSION}
 PKGNAMESUFFIX=	-qt4

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	2.8.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	audio kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 

diff --git a/audio/audiocd-kio/Makefile b/audio/audiocd-kio/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	audiocd-kio
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde kde-applications
 
 MAINTAINER=	[email protected]

diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
@@ -13,6 +13,10 @@ COMMENT=	Ultimate music player for Unix-like systems
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
+BROKEN_aarch64=		Fails to compile: error: invalid conversion between vector type and integer type
+BROKEN_armv6=		Fails to compile: error: invalid conversion between vector type and integer type
+BROKEN_armv7=		Fails to compile: error: invalid conversion between vector type and integer type
+
 GNU_CONFIGURE=	yes
 USES=		compiler:c11 desktop-file-utils gettext gmake iconv libtool \
 		pkgconfig shebangfix tar:bzip2
@@ -28,9 +32,6 @@ INSTALLS_ICONS=	yes
 SHEBANG_FILES=	yasmwrapper.sh
 INSTALL_TARGET=	install-strip
 
-BROKEN_armv6=		Fails to compile: error: invalid conversion between vector type and integer type
-BROKEN_armv7=		Fails to compile: error: invalid conversion between vector type and integer type
-
 OPTIONS_DEFINE=	PULSEAUDIO GUI VFS LASTFM ART SUPEREQ SID FFAP VTX \
 		HOTKEYS OGG FFMPEG FLAC SNDFILE WAVPACK CDDA GME DUMB NOTIFY \
 		MUSEPACK WILDMIDI TTA DCA AAC MMS SHN SHELLEXEC NLS M3U \

diff --git a/audio/ir-lv2/Makefile b/audio/ir-lv2/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	ir
-DISTVERSION=	1.3.3-2
-DISTVERSIONSUFFIX=	-gb94bc67
+DISTVERSION=	1.3.3-8
+DISTVERSIONSUFFIX=	-g0a36907
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -27,10 +27,9 @@ GH_ACCOUNT=	tomszilagyi
 GH_PROJECT=	ir.lv2
 USE_GNOME=	glib20 gtk20 gdkpixbuf2 cairo
 
+MAKE_ENV=	INSTDIR=${STAGEDIR}${PREFIX}/lib/lv2
+
 PLIST_FILES=	lib/lv2/ir.lv2/ir.so lib/lv2/ir.lv2/ir.ttl \
 		lib/lv2/ir.lv2/ir_gui.so lib/lv2/ir.lv2/manifest.ttl
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/ir.lv2/*.so
-
 .include <bsd.port.mk>
diff --git a/audio/ir-lv2/distinfo b/audio/ir-lv2/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1528565114
-SHA256 (tomszilagyi-ir.lv2-1.3.3-2-gb94bc67_GH0.tar.gz) = c6a5c907e74ad649af5a845ecf88bc9af285975ed8a712ec85dbd8187c6cbdd7
-SIZE (tomszilagyi-ir.lv2-1.3.3-2-gb94bc67_GH0.tar.gz) = 126424
+TIMESTAMP = 1529568477
+SHA256 (tomszilagyi-ir.lv2-1.3.3-8-g0a36907_GH0.tar.gz) = 707ab1577c8da41ccf0a92880552adec80e0d8b64daeff98eb49755e658921b5
+SIZE (tomszilagyi-ir.lv2-1.3.3-8-g0a36907_GH0.tar.gz) = 126563
+SHA256 (3c892744fce01661293a5e466d341d4f0e852f22.patch) = 5653babe7cca78f381d5969a268c0b3272b7a7e73cef5e66d47bb014c304fe6a
+SIZE (3c892744fce01661293a5e466d341d4f0e852f22.patch) = 2468
diff --git a/audio/ir-lv2/files/patch-Makefile b/audio/ir-lv2/files/patch-Makefile
@@ -1,43 +1,11 @@
---- Makefile.orig	2018-01-03 15:11:45 UTC
+--- Makefile.orig	2018-06-21 08:16:45 UTC
 +++ Makefile
-@@ -27,31 +27,31 @@ C4LIBS = -lsndfile `pkg-config --libs gt
- all: ir.so ir_gui.so
-
- ir.o: ir.cc ir.h ir_utils.h
--	g++ ir.cc $(CPPFLAGS) -c -fPIC -o ir.o
-+	$(CXX) ir.cc $(CPPFLAGS) -c -fPIC -o ir.o
-
- ir_gui.o: ir_gui.cc ir.h ir_utils.h ir_wavedisplay.h
--	g++ ir_gui.cc $(CPPFLAGS) -c -fPIC -o ir_gui.o
-+	$(CXX) ir_gui.cc $(CPPFLAGS) -c -fPIC -o ir_gui.o
-
- ir_utils.o: ir_utils.cc ir_utils.h ir.h
--	g++ ir_utils.cc $(CPPFLAGS) -c -fPIC -o ir_utils.o
-+	$(CXX) ir_utils.cc $(CPPFLAGS) -c -fPIC -o ir_utils.o
-
- ir_meter.o: ir_meter.cc ir_meter.h ir.h ir_utils.h
--	g++ ir_meter.cc $(CPPFLAGS) -c -fPIC -o ir_meter.o
-+	$(CXX) ir_meter.cc $(CPPFLAGS) -c -fPIC -o ir_meter.o
-
- ir_modeind.o: ir_modeind.cc ir_modeind.h ir.h ir_utils.h
--	g++ ir_modeind.cc $(CPPFLAGS) -c -fPIC -o ir_modeind.o
-+	$(CXX) ir_modeind.cc $(CPPFLAGS) -c -fPIC -o ir_modeind.o
-
- ir_wavedisplay.o: ir_wavedisplay.cc ir_wavedisplay.h ir.h ir_utils.h
--	g++ ir_wavedisplay.cc $(CPPFLAGS) -c -fPIC -o ir_wavedisplay.o
-+	$(CXX) ir_wavedisplay.cc $(CPPFLAGS) -c -fPIC -o ir_wavedisplay.o
-
- ir.so: ir.o ir_utils.o
--	g++ $(LDFLAGS) ir.o ir_utils.o $(LIBS) -shared -o ir.so
-+	$(CXX) $(LDFLAGS) ir.o ir_utils.o $(LIBS) -shared -o ir.so
+@@ -58,7 +58,7 @@ ir.so: ir.o ir_utils.o
+ 	$(CXX) $(LDFLAGS) ir.o ir_utils.o $(LIBS) -shared -o ir.so
 
  ir_gui.so: ir_gui.o ir_utils.o ir_meter.o ir_modeind.o ir_wavedisplay.o
--	g++ $(LDFLAGS) ir_gui.o ir_utils.o ir_meter.o ir_modeind.o ir_wavedisplay.o $(LIBS) -shared -z nodelete -o ir_gui.so
+-	$(CXX) $(LDFLAGS) ir_gui.o ir_utils.o ir_meter.o ir_modeind.o ir_wavedisplay.o $(LIBS) -shared -z nodelete -o ir_gui.so
 +	$(CXX) $(LDFLAGS) ir_gui.o ir_utils.o ir_meter.o ir_modeind.o ir_wavedisplay.o $(LIBS) -shared -o ir_gui.so
 
  convert4chan: convert4chan.c
--	gcc $(C4CFLAGS) $(CPPFLAGS) $(LDFLAGS) convert4chan.c $(C4LIBS) -o convert4chan
-+	$(CC) $(C4CFLAGS) $(CPPFLAGS) $(LDFLAGS) convert4chan.c $(C4LIBS) -o convert4chan
-
- install: all
- 	mkdir -p $(INSTDIR)
+ 	$(CC) $(C4CFLAGS) $(CPPFLAGS) $(LDFLAGS) convert4chan.c $(C4LIBS) -o convert4chan
diff --git a/audio/ir-lv2/pkg-descr b/audio/ir-lv2/pkg-descr
@@ -7,4 +7,4 @@ convolver especially for creating reverb effects. Supports impulse
 responses with 1, 2 or 4 channels, in any soundfile format supported
 by libsndfile.
 
-WWW: https://github.com/Anchakor/ir.lv2
+WWW: https://github.com/tomszilagyi/ir.lv2
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	juk
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde kde-applications
 
 MAINTAINER=	[email protected]

diff --git a/audio/kmix-kde4/Makefile b/audio/kmix-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kmix
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	[email protected]

diff --git a/audio/kscd-kde4/Makefile b/audio/kscd-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kscd
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	[email protected]

diff --git a/audio/lastfm-desktop/Makefile b/audio/lastfm-desktop/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lastfm-desktop
 PORTVERSION=	2.1.36
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 
 MAINTAINER=	[email protected]
@@ -39,7 +39,7 @@ OPTIONS_DEFAULT=	VLC
 GSTREAMER_DESC=		Multimedia via Phonon-GStreamer
 GSTREAMER_USE=		QT4=phonon-gst_run
 VLC_DESC=		Multimedia via Phonon-VLC
-VLC_RUN_DEPENDS=	phonon-vlc>=0.6.1:multimedia/phonon-vlc
+VLC_RUN_DEPENDS=	phonon-vlc-qt4>=0.6.1:multimedia/phonon-vlc@qt4
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}

diff --git a/audio/libkcompactdisc-kde4/Makefile b/audio/libkcompactdisc-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libkcompactdisc
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	[email protected]

diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libkcompactdisc
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde kde-applications
 
 MAINTAINER=	[email protected]

diff --git a/audio/minitunes/Makefile b/audio/minitunes/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	minitunes
 PORTVERSION=	0.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://flavio.tordini.org/files/${PORTNAME}/
 

diff --git a/audio/mous/Makefile b/audio/mous/Makefile
@@ -12,6 +12,8 @@ COMMENT=	Simple yet powerful audio player
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_aarch64=		fails to compile: mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
+
 USES=		cmake:outsource compiler:c++14-lang
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes

diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
@@ -2,67 +2,59 @@
 
 PORTNAME=	openal-soft
 PORTVERSION=	1.18.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Software implementation of the OpenAL specification
 
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	openal-200[0-9]*
 
-USES=		tar:bzip2 cmake compiler:c11
+USES=		cmake:outsource compiler:c11 tar:bzip2
 USE_LDCONFIG=	yes
 LLD_UNSAFE=	yes
-CMAKE_ARGS=	-DSHARE_INSTALL_DIR:STRING=${ETCDIR} \
-		-DALSOFT_REQUIRE_OSS:BOOL=OFF \
-		-DALSOFT_REQUIRE_JACK:BOOL=OFF \
-		-DALSOFT_REQUIRE_SOLARIS:BOOL=OFF \
-		-DALSOFT_REQUIRE_SNDIO:BOOL=OFF \
-		-DALSOFT_REQUIRE_QSA:BOOL=OFF \
-		-DALSOFT_BACKEND_ALSA:BOOL=OFF \
-		-DALSOFT_BACKEND_WAVE:BOOL=ON \
-		-DALSOFT_EXAMPLES:BOOL=OFF \
-		-DALSOFT_UTILS:BOOL=ON
-
-OPTIONS_DEFINE=		EXAMPLES FLUIDSYNTH CONFIG OSS JACK PORTAUDIO \
-			PULSEAUDIO SNDIO
+CMAKE_ARGS=	-DCMAKE_INSTALL_DATADIR:STRING="${PREFIX}/etc"
+CMAKE_OFF=	ALSOFT_BACKEND_ALSA \
+		ALSOFT_DLOPEN \
+		ALSOFT_EXAMPLES \
+		ALSOFT_REQUIRE_SOLARIS \
+		ALSOFT_REQUIRE_QSA
+CMAKE_ON=	ALSOFT_BACKEND_WAVE \
+		ALSOFT_UTILS
+LDFLAGS+=	-Wl,--as-needed # do not link with librt and libdl
+
+OPTIONS_DEFINE=		EXAMPLES CONFIG JACK OSS PORTAUDIO PULSEAUDIO SNDIO
 OPTIONS_DEFAULT=	OSS
 OPTIONS_SUB=		yes
+
 CONFIG_DESC=		Install configuration utility (needs Qt 4.x)
 
-#ALSA_CMAKE_ON=		-DALSOFT_REQUIRE_ALSA:BOOL=ON
-#ALSA_CMAKE_OFF=		-DALSOFT_BACKEND_ALSA:BOOL=OFF
-#ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-CONFIG_CMAKE_ON=	-DALSOFT_NO_CONFIG_UTIL:BOOL=OFF
-CONFIG_CMAKE_OFF=	-DALSOFT_NO_CONFIG_UTIL:BOOL=ON
+CONFIG_CMAKE_BOOL_OFF=	ALSOFT_NO_CONFIG_UTIL
+CONFIG_CMAKE_ON=	-DALSOFT_NO_QT5:BOOL=ON
 CONFIG_USE=		QT4=corelib,gui,qmake_build,moc_build,rcc_build,uic_build
-FLUIDSYNTH_CMAKE_ON=	-DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON
-FLUIDSYNTH_CMAKE_OFF=	-DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF
-FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
-OSS_CMAKE_ON=		-DALSOFT_REQUIRE_OSS:BOOL=ON
-OSS_CMAKE_OFF=		-DALSOFT_BACKEND_OSS:BOOL=OFF
-JACK_CMAKE_ON=		-DALSOFT_REQUIRE_JACK:BOOL=ON
-JACK_CMAKE_OFF=		-DALSOFT_BACKEND_JACK:BOOL=OFF
+
+JACK_CMAKE_BOOL=	ALSOFT_REQUIRE_JACK ALSOFT_BACKEND_JACK
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
-PORTAUDIO_CMAKE_ON=	-DALSOFT_REQUIRE_PORTAUDIO:BOOL=ON
-PORTAUDIO_CMAKE_OFF=	-DALSOFT_BACKEND_PORTAUDIO:BOOL=OFF
+
+OSS_CMAKE_BOOL=		ALSOFT_REQUIRE_OSS ALSOFT_BACKEND_OSS
+
+PORTAUDIO_CMAKE_BOOL=	ALSOFT_REQUIRE_PORTAUDIO ALSOFT_BACKEND_PORTAUDIO
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
-PULSEAUDIO_CMAKE_ON=	-DALSOFT_REQUIRE_PULSEAUDIO:BOOL=ON
-PULSEAUDIO_CMAKE_OFF=	-DALSOFT_BACKEND_PULSEAUDIO:BOOL=OFF
-PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
-SNDIO_CMAKE_ON=		-DALSOFT_REQUIRE_SNDIO:BOOL=ON
-SNDIO_CMAKE_OFF=	-DALSOFT_BACKEND_SNDIO:BOOL=OFF
+
+PULSEAUDIO_CMAKE_BOOL=	ALSOFT_REQUIRE_PULSEAUDIO ALSOFT_BACKEND_PULSEAUDIO
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+
+SNDIO_CMAKE_BOOL=	ALSOFT_REQUIRE_SNDIO ALSOFT_BACKEND_SNDIO
+SNDIO_IMPLIES=		OSS # provide fallback for missing sndio capture support
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \
 		${WRKSRC}/Alc/alcConfig.c
-	@${REINPLACE_CMD} 's|$${CMAKE_INSTALL_DATADIR}/openal|${ETCDIR}|' \
-		${WRKSRC}/CMakeLists.txt
 
 post-install-EXAMPLES-on:
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \

diff --git a/audio/openal-soft/files/patch-Alc_ALc.c b/audio/openal-soft/files/patch-Alc_ALc.c
@@ -0,0 +1,22 @@
+Prefer sndio over OSS when it's enabled.
+
+--- Alc/ALc.c.orig	2018-06-21 02:27:21 UTC
++++ Alc/ALc.c
+@@ -69,14 +69,14 @@ static struct BackendInfo BackendList[] = {
+ #ifdef HAVE_COREAUDIO
+     { "core", ALCcoreAudioBackendFactory_getFactory },
+ #endif
+-#ifdef HAVE_OSS
+-    { "oss", ALCossBackendFactory_getFactory },
+-#endif
+ #ifdef HAVE_SOLARIS
+     { "solaris", ALCsolarisBackendFactory_getFactory },
+ #endif
+ #ifdef HAVE_SNDIO
+     { "sndio", ALCsndioBackendFactory_getFactory },
++#endif
++#ifdef HAVE_OSS
++    { "oss", ALCossBackendFactory_getFactory },
+ #endif
+ #ifdef HAVE_QSA
+     { "qsa", ALCqsaBackendFactory_getFactory },