Attachment #228576 for bug #259059

Lines 1-8 Link Here

(-)b/audio/mixxx/Makefile (-3 / +2 lines)
1	# Created by: Jean-Yves Lefort <jylefort@brutele.be>	1	# Created by: Jean-Yves Lefort <jylefort@brutele.be>
2		2
3	PORTNAME= mixxx	3	PORTNAME= mixxx
4	DISTVERSION= 2.3.0	4	DISTVERSION= 2.3.1
5	PORTREVISION= 3
6	CATEGORIES= audio	5	CATEGORIES= audio
7		6
8	MAINTAINER= acm@FreeBSD.org	7	MAINTAINER= acm@FreeBSD.org
Lines 80-86 WAVPACK_CMAKE_BOOL= WAVPACK Link Here
80		79
81	post-patch:	80	post-patch:
82	@${REINPLACE_CMD} -e "s\|^Exec=.*\|Exec=mixxx\|" \	81	@${REINPLACE_CMD} -e "s\|^Exec=.*\|Exec=mixxx\|" \
83	${WRKSRC}/res/linux/mixxx.desktop	82	${WRKSRC}/res/linux/org.mixxx.Mixxx.desktop
84	@${REINPLACE_CMD} -e "s,(Q_OS_LINUX),(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD),g" \	83	@${REINPLACE_CMD} -e "s,(Q_OS_LINUX),(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD),g" \
85	${WRKSRC}/src/util/screensaver.h	84	${WRKSRC}/src/util/screensaver.h
86	.for i in midi/midimessage.h	85	.for i in midi/midimessage.h

Lines 1-3 Link Here

(-)b/audio/mixxx/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1625856636	1	TIMESTAMP = 1633921966
2	SHA256 (mixxxdj-mixxx-2.3.0_GH0.tar.gz) = ea0dad33bafa9f7a3523f19efa7c3163070fc8b946e93159907a2efb6037babe	2	SHA256 (mixxxdj-mixxx-2.3.1_GH0.tar.gz) = 35cff9acece5f651af472c11952ba59d5bc22e36225e6cb65c931afe0bc25b71
3	SIZE (mixxxdj-mixxx-2.3.0_GH0.tar.gz) = 39736601	3	SIZE (mixxxdj-mixxx-2.3.1_GH0.tar.gz) = 39977210




--- cmake/modules/FindLibUSB.cmake.orig	2021-06-28 20:04:59 UTC
+++ cmake/modules/FindLibUSB.cmake
@@ -57,7 +57,11 @@ find_path(LibUSB_INCLUDE_DIR
 mark_as_advanced(LibUSB_INCLUDE_DIR)
 
 find_library(LibUSB_LIBRARY
+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+  NAMES usb
+else
   NAMES usb-1.0
+endif()
   PATHS ${PC_LibUSB_LIBRARY_DIRS}
   DOC "LibUSB library"
 )

Removed Link Here

(-)a/audio/mixxx/files/patch-lib_rigtorp_SPSCQueue_include_rigtorp_SPSCQueue.h (-11 lines)
1	--- lib/rigtorp/SPSCQueue/include/rigtorp/SPSCQueue.h.orig 2021-06-28 20:04:59 UTC
2	+++ lib/rigtorp/SPSCQueue/include/rigtorp/SPSCQueue.h
3	@@ -189,7 +189,7 @@ template <typename T, typename Allocator = std::alloca
4	// on macOS there is a bug in libc++ where __cpp_lib_hardware_interference_size
5	// is defined but std::hardware_destructive_interference_size is not actually implemented
6	// https://bugs.llvm.org/show_bug.cgi?id=41423
7	-#if defined(__cpp_lib_hardware_interference_size) && ! defined(__APPLE__)
8	+#if defined(__cpp_lib_hardware_interference_size) && ! defined(__APPLE__) && ! defined(__FreeBSD__)
9	static constexpr size_t kCacheLineSize =
10	std::hardware_destructive_interference_size;
11	#else

Removed Link Here

(-)a/audio/mixxx/files/patch-src_util_versionstore.cpp (-11 lines)
1	--- src/util/versionstore.cpp.orig 2021-07-17 15:58:25 UTC
2	+++ src/util/versionstore.cpp
3	@@ -77,6 +77,8 @@ QString VersionStore::platform() {
4	QString base = QStringLiteral("Linux");
5	#elif defined(__WINDOWS__)
6	QString base = QStringLiteral("Windows");
7	+#elif defined(__FreeBSD__)
8	+ QString base = QStringLiteral("FreeBSD");
9	#else
10	QString base = QStringLiteral("Unknown OS");
11	#endif

Return to bug 259059

Removed Link Here

(-)a/audio/mixxx/files/patch-cmake_modules_FindLibUSB.cmake (-14 lines)
1	--- cmake/modules/FindLibUSB.cmake.orig 2021-06-28 20:04:59 UTC
2	+++ cmake/modules/FindLibUSB.cmake
3	@@ -57,7 +57,11 @@ find_path(LibUSB_INCLUDE_DIR
4	mark_as_advanced(LibUSB_INCLUDE_DIR)
5
6	find_library(LibUSB_LIBRARY
7	+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
8	+ NAMES usb
9	+else
10	NAMES usb-1.0
11	+endif()
12	PATHS ${PC_LibUSB_LIBRARY_DIRS}
13	DOC "LibUSB library"
14	)

Lines 1-8 Link Here

(-)b/audio/mixxx/pkg-plist (-4 / +20 lines)
1	bin/mixxx	1	bin/mixxx
2	share/applications/mixxx.desktop	2	share/applications/org.mixxx.Mixxx.desktop
		3	share/icons/hicolor/128x128/apps/mixxx.png
		4	share/icons/hicolor/256x256/apps/mixxx.png
3	share/icons/hicolor/32x32/apps/mixxx.png	5	share/icons/hicolor/32x32/apps/mixxx.png
		6	share/icons/hicolor/512x512/apps/mixxx.png
		7	share/icons/hicolor/64x64/apps/mixxx.png
4	share/icons/hicolor/scalable/apps/mixxx.svg	8	share/icons/hicolor/scalable/apps/mixxx.svg
5	share/metainfo/mixxx.metainfo.xml	9	share/metainfo/org.mixxx.Mixxx.metainfo.xml
6	%%DATADIR%%/controllers/.eslintrc.json	10	%%DATADIR%%/controllers/.eslintrc.json
7	%%DATADIR%%/controllers/Akai MPD24.midi.xml	11	%%DATADIR%%/controllers/Akai MPD24.midi.xml
8	%%DATADIR%%/controllers/Akai-LPD8-RK-scripts.js	12	%%DATADIR%%/controllers/Akai-LPD8-RK-scripts.js
Lines 163-168 share/metainfo/mixxx.metainfo.xml Link Here
163	%%DATADIR%%/controllers/Numark MIXTRACK.midi.xml	167	%%DATADIR%%/controllers/Numark MIXTRACK.midi.xml
164	%%DATADIR%%/controllers/Numark Mixtrack 2.midi.xml	168	%%DATADIR%%/controllers/Numark Mixtrack 2.midi.xml
165	%%DATADIR%%/controllers/Numark Mixtrack Platinum.midi.xml	169	%%DATADIR%%/controllers/Numark Mixtrack Platinum.midi.xml
		170	%%DATADIR%%/controllers/Numark Mixtrack Pro FX.midi.xml
166	%%DATADIR%%/controllers/Numark Mixtrack Pro.midi.xml	171	%%DATADIR%%/controllers/Numark Mixtrack Pro.midi.xml
167	%%DATADIR%%/controllers/Numark N4.midi.xml	172	%%DATADIR%%/controllers/Numark N4.midi.xml
168	%%DATADIR%%/controllers/Numark NS7.midi.xml	173	%%DATADIR%%/controllers/Numark NS7.midi.xml
Lines 176-181 share/metainfo/mixxx.metainfo.xml Link Here
176	%%DATADIR%%/controllers/Numark-Mixtrack-3-scripts.js	181	%%DATADIR%%/controllers/Numark-Mixtrack-3-scripts.js
177	%%DATADIR%%/controllers/Numark-Mixtrack-3.midi.xml	182	%%DATADIR%%/controllers/Numark-Mixtrack-3.midi.xml
178	%%DATADIR%%/controllers/Numark-Mixtrack-Platinum-scripts.js	183	%%DATADIR%%/controllers/Numark-Mixtrack-Platinum-scripts.js
		184	%%DATADIR%%/controllers/Numark-Mixtrack-Pro-FX-scripts.js
179	%%DATADIR%%/controllers/Numark-Mixtrack-Pro-scripts.js	185	%%DATADIR%%/controllers/Numark-Mixtrack-Pro-scripts.js
180	%%DATADIR%%/controllers/Numark-N4-scripts.js	186	%%DATADIR%%/controllers/Numark-N4-scripts.js
181	%%DATADIR%%/controllers/Numark-NS7-scripts.js	187	%%DATADIR%%/controllers/Numark-NS7-scripts.js
Lines 183-188 share/metainfo/mixxx.metainfo.xml Link Here
183	%%DATADIR%%/controllers/Numark-Total-Control-scripts.js	189	%%DATADIR%%/controllers/Numark-Total-Control-scripts.js
184	%%DATADIR%%/controllers/Numark-V7-scripts.js	190	%%DATADIR%%/controllers/Numark-V7-scripts.js
185	%%DATADIR%%/controllers/Numark-iDJ-Live-II-scripts.js	191	%%DATADIR%%/controllers/Numark-iDJ-Live-II-scripts.js
		192	%%DATADIR%%/controllers/Numark_DJ2GO2_Touch.midi.xml
		193	%%DATADIR%%/controllers/Numark_DJ2GO2_Touch_scripts.js
186	%%DATADIR%%/controllers/Pioneer CDJ HID.hid.xml	194	%%DATADIR%%/controllers/Pioneer CDJ HID.hid.xml
187	%%DATADIR%%/controllers/Pioneer CDJ-2000.midi.xml	195	%%DATADIR%%/controllers/Pioneer CDJ-2000.midi.xml
188	%%DATADIR%%/controllers/Pioneer CDJ-350 Ch1.midi.xml	196	%%DATADIR%%/controllers/Pioneer CDJ-350 Ch1.midi.xml
Lines 284-290 share/metainfo/mixxx.metainfo.xml Link Here
284	%%DATADIR%%/controllers/novation-launchpad/.gitignore	292	%%DATADIR%%/controllers/novation-launchpad/.gitignore
285	%%DATADIR%%/controllers/novation-launchpad/LICENSE	293	%%DATADIR%%/controllers/novation-launchpad/LICENSE
286	%%DATADIR%%/controllers/novation-launchpad/Makefile	294	%%DATADIR%%/controllers/novation-launchpad/Makefile
287	%%DATADIR%%/controllers/novation-launchpad/README.MD	295	%%DATADIR%%/controllers/novation-launchpad/README.md
288	%%DATADIR%%/controllers/novation-launchpad/docs/lp-1.png	296	%%DATADIR%%/controllers/novation-launchpad/docs/lp-1.png
289	%%DATADIR%%/controllers/novation-launchpad/docs/lp-2.png	297	%%DATADIR%%/controllers/novation-launchpad/docs/lp-2.png
290	%%DATADIR%%/controllers/novation-launchpad/docs/lp-3.png	298	%%DATADIR%%/controllers/novation-launchpad/docs/lp-3.png
Lines 491-496 share/metainfo/mixxx.metainfo.xml Link Here
491	%%DATADIR%%/skins/Deere/icon/ic_lib_spinbox_up_white.svg	499	%%DATADIR%%/skins/Deere/icon/ic_lib_spinbox_up_white.svg
492	%%DATADIR%%/skins/Deere/icon/ic_library_bpm_locked.svg	500	%%DATADIR%%/skins/Deere/icon/ic_library_bpm_locked.svg
493	%%DATADIR%%/skins/Deere/icon/ic_library_bpm_unlocked.svg	501	%%DATADIR%%/skins/Deere/icon/ic_library_bpm_unlocked.svg
		502	%%DATADIR%%/skins/Deere/icon/ic_library_checkbox.svg
		503	%%DATADIR%%/skins/Deere/icon/ic_library_checkbox_checked.svg
494	%%DATADIR%%/skins/Deere/icon/ic_library_checkmark_blue.svg	504	%%DATADIR%%/skins/Deere/icon/ic_library_checkmark_blue.svg
495	%%DATADIR%%/skins/Deere/icon/ic_library_checkmark_grey.svg	505	%%DATADIR%%/skins/Deere/icon/ic_library_checkmark_grey.svg
496	%%DATADIR%%/skins/Deere/icon/ic_library_checkmark_orange.svg	506	%%DATADIR%%/skins/Deere/icon/ic_library_checkmark_orange.svg
Lines 734-739 share/metainfo/mixxx.metainfo.xml Link Here
734	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_bpm_locked_orange.svg	744	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_bpm_locked_orange.svg
735	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_bpm_unlocked_grey.svg	745	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_bpm_unlocked_grey.svg
736	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_bpm_up.svg	746	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_bpm_up.svg
		747	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkbox.svg
		748	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkbox_checked.svg
737	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg	749	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg
738	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_grey.svg	750	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_grey.svg
739	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_orange.svg	751	%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_orange.svg
Lines 1200-1205 share/metainfo/mixxx.metainfo.xml Link Here
1200	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_black.svg	1212	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_black.svg
1201	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_blue.svg	1213	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_blue.svg
1202	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg	1214	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg
		1215	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkbox.svg
1203	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg	1216	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg
1204	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkmark_grey.svg	1217	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkmark_grey.svg
1205	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_blue.svg	1218	%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_blue.svg
Lines 1611-1616 share/metainfo/mixxx.metainfo.xml Link Here
1611	%%DATADIR%%/skins/Shade/btn/btn_kill_overdown_summer.png	1624	%%DATADIR%%/skins/Shade/btn/btn_kill_overdown_summer.png
1612	%%DATADIR%%/skins/Shade/btn/btn_lib_bpm_locked.svg	1625	%%DATADIR%%/skins/Shade/btn/btn_lib_bpm_locked.svg
1613	%%DATADIR%%/skins/Shade/btn/btn_lib_bpm_unlocked.svg	1626	%%DATADIR%%/skins/Shade/btn/btn_lib_bpm_unlocked.svg
		1627	%%DATADIR%%/skins/Shade/btn/btn_lib_checkbox.svg
		1628	%%DATADIR%%/skins/Shade/btn/btn_lib_checkbox_checked.svg
1614	%%DATADIR%%/skins/Shade/btn/btn_lib_checkmark.svg	1629	%%DATADIR%%/skins/Shade/btn/btn_lib_checkmark.svg
1615	%%DATADIR%%/skins/Shade/btn/btn_lib_checkmark_black.svg	1630	%%DATADIR%%/skins/Shade/btn/btn_lib_checkmark_black.svg
1616	%%DATADIR%%/skins/Shade/btn/btn_lib_checkmark_dark_grey.svg	1631	%%DATADIR%%/skins/Shade/btn/btn_lib_checkmark_dark_grey.svg
Lines 2246-2251 share/metainfo/mixxx.metainfo.xml Link Here
2246	%%DATADIR%%/skins/Tango/buttons/btn_keylock_on.svg	2261	%%DATADIR%%/skins/Tango/buttons/btn_keylock_on.svg
2247	%%DATADIR%%/skins/Tango/buttons/btn_lib_bpm_locked.svg	2262	%%DATADIR%%/skins/Tango/buttons/btn_lib_bpm_locked.svg
2248	%%DATADIR%%/skins/Tango/buttons/btn_lib_bpm_unlocked.svg	2263	%%DATADIR%%/skins/Tango/buttons/btn_lib_bpm_unlocked.svg
		2264	%%DATADIR%%/skins/Tango/buttons/btn_lib_checkbox.svg
		2265	%%DATADIR%%/skins/Tango/buttons/btn_lib_checkbox_checked.svg
2249	%%DATADIR%%/skins/Tango/buttons/btn_lib_checkmark.svg	2266	%%DATADIR%%/skins/Tango/buttons/btn_lib_checkmark.svg
2250	%%DATADIR%%/skins/Tango/buttons/btn_lib_checkmark_dark_grey.svg	2267	%%DATADIR%%/skins/Tango/buttons/btn_lib_checkmark_dark_grey.svg
2251	%%DATADIR%%/skins/Tango/buttons/btn_lib_checkmark_grey.svg	2268	%%DATADIR%%/skins/Tango/buttons/btn_lib_checkmark_grey.svg
2252	-