gentoo auto-resync : 08:08:2024 - 12:38:45

3 files changed, 117 insertions, 4 deletions

diff --git a/media-libs/alure/Manifest b/media-libs/alure/Manifest
index 275c217392e3..a14562de69a5 100644
--- a/media-libs/alure/Manifest
+++ b/media-libs/alure/Manifest
@@ -1,5 +1,6 @@
+AUX alure-1.2-cmake-flags.patch 5581 BLAKE2B e5dae50b51a4b78945ce875fb7330e0edb95b24ed96c7d1270d6ca1b8412f18097c8228326eb7110eac8e973bf3819f4ee71e21706f206061b4aec5ef5c2cae2 SHA512 17258c7c6be2ee211f70c097a98b3069538d6e9b4488c0bd7de4028f8552e8e26425fed4bc7c33e2ffbae9a3c7ce8f397b9305448d5931c731900392f24006b7
 AUX alure-1.2-include-unistd.patch 192 BLAKE2B 61cfebb2c2f8d2ea0e228d81f37d25b6b59445711658a04e7e85c20624099aeb86c065e6d7ab4f3cdc65b5ba35248cde4c93104c971fd008c1aba19de259bd9f SHA512 ebb1f841ea28f7e7690f1cdf6991af6bd97486473b63ffd11d79b05d66faf44b8ee590e45b0b1ede69af99a3f817103e8e444885834defd4ccbc76e2104649e8
 AUX alure-1.2-new-dumb.patch 954 BLAKE2B e136519eb210cc003f8e66a02a1023cd5c169998dfef99b2dcf3d46b6259a04c3c7094bd4bd892f92b4a53a48cd3ca6028da4163d418b31eb5ae5a9380270582 SHA512 27000ad19dbd9278fea67c40e037745b182c4b067b30d5853274b1cc4216813ba0d9f3e292e4d997d93b870cfc0117cfd1a9a2f5adfc77defb908765f3fd03ea
 DIST alure-1.2.tar.bz2 65210 BLAKE2B 6e99e5bb56c96db27b2ab5ff67c98406636e5b1fc9e446356234c332edf0a4c167707068edf380f99a3744cf0f26a76c1c0325401977d1b3fe8bc989c4a1129c SHA512 f1a2dbbe6870c9d34da724e49cad993cabdca393482bf6476adc925ba5da2a34dc26d86e612e6ed829183c6df595d46921766f46063d0d478ddb18deeb8878a6
-EBUILD alure-1.2-r3.ebuild 1273 BLAKE2B 10986afe19fd150b0ec6c4aecf62e978bf4facf8c3ce2f7cbbd4e11a328f6fd04dcb79a5f1de70f834f582d20c53074ec2aa8d29c8d8771df65f502c48eae69e SHA512 c55ab8d3aacf518e968a6593202cd6a649b819db3ee039cffe29621ec60d6033675c1a6f3c9f18f625e6cb3109f2b6ed135e1a063d093af6c62a63b20778f80b
+EBUILD alure-1.2-r4.ebuild 1342 BLAKE2B aad29b3d37234015ec48404572cf5768ac6af23018d5f74586ba62b0126fc54efbfda67f71f3f23d4ae53179940cc02d91dfaf2b7862a2ce96836063fd1549d6 SHA512 9e2ea0153ff01413e7bb526edfecf99e7c071810ed7871a08a32dfdcaea9f5bc81df0beaabbeba2e6a2a7e7563012fa2b492660b32481018b4bb46b23c758150
 MISC metadata.xml 441 BLAKE2B 2dde79d4d093760f8483f08e057ea520f2ec5f26dc4453bc4b0bfea8feff7e49a236148f9c3688f9c668c1f8e232f06f39ba1dc2466be0b962b16fe7e6f7cf18 SHA512 36cdf23d28482ca754e82574845575db0f231d89e8bbac4c7aa1b25315a04ccd83f7b3fbe97b9754e2fc13726fc7032b1fe97cf7de0b571da98d385d8222b55c
diff --git a/media-libs/alure/alure-1.2-r3.ebuild b/media-libs/alure/alure-1.2-r4.ebuild
index ee620b3c4b69..fe5fb9fa0bbb 100644
--- a/media-libs/alure/alure-1.2-r3.ebuild
+++ b/media-libs/alure/alure-1.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,8 +6,8 @@ EAPI=8
 inherit cmake
 
 DESCRIPTION="The OpenAL Utility Toolkit"
-HOMEPAGE="https://kcat.strangesoft.net/alure.html"
-SRC_URI="https://kcat.strangesoft.net/alure-releases/${P}.tar.bz2"
+HOMEPAGE="https://web.archive.org/web/20200503181758/https://kcat.strangesoft.net/alure.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${P}-include-unistd.patch
 	"${FILESDIR}"/${P}-new-dumb.patch
+	"${FILESDIR}"/${P}-cmake-flags.patch
 )
 
 src_prepare() {
@@ -38,6 +39,7 @@ src_prepare() {
 src_configure() {
 	# FIXME: libmodplug/sndfile.h from libmodplug conflict with sndfile.h from libsndfile
 	local mycmakeargs=(
+		-DDYNLOAD=OFF
 		-DMODPLUG=OFF
 		-DDUMB=$(usex dumb)
 		-DBUILD_EXAMPLES=$(usex examples)
diff --git a/media-libs/alure/files/alure-1.2-cmake-flags.patch b/media-libs/alure/files/alure-1.2-cmake-flags.patch
new file mode 100644
index 000000000000..726200253528
--- /dev/null
+++ b/media-libs/alure/files/alure-1.2-cmake-flags.patch
@@ -0,0 +1,110 @@
+Fix flag handling in newer CMake versions by using the semicolon-separated
+COMPILE_OPTIONS instead of COMPILE_FLAGS.
+
+James Le Cuirot <chewi@gentoo.org>
+
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2011-07-29 09:37:48.000000000 +0100
++++ b/CMakeLists.txt	2024-08-05 18:57:24.894117058 +0100
+@@ -74,7 +74,7 @@
+     CHECK_FUNCTION_EXISTS(_fseeki64 HAVE__FSEEKI64)
+ ENDIF(NOT HAVE_FSEEKO)
+ 
+-SET(STATIC_CFLAGS "${STATIC_CFLAGS} -DALURE_STATIC_LIBRARY")
++SET(STATIC_CFLAGS "${STATIC_CFLAGS};-DALURE_STATIC_LIBRARY")
+ 
+ IF(MSVC)
+     # ???
+@@ -85,7 +85,7 @@
+ 
+         # Force -fPIC for the static lib, because it causes problems when the
+         # static version is linked to a dynamic lib
+-        SET(STATIC_CFLAGS "${STATIC_CFLAGS} -fPIC")
++        SET(STATIC_CFLAGS "${STATIC_CFLAGS};-fPIC")
+     ENDIF(NOT WIN32)
+ 
+     CHECK_C_COMPILER_FLAG(-Wextra HAVE_WEXTRA)
+@@ -215,7 +215,7 @@
+         SET(HAS_SNDFILE 1)
+         LINK_DIRECTORIES(${SNDFILE_LIBRARY_DIRS})
+         SET_SOURCE_FILES_PROPERTIES(src/codec_sndfile.cpp PROPERTIES
+-                                    COMPILE_FLAGS "${SNDFILE_CFLAGS}")
++                                    COMPILE_OPTIONS "${SNDFILE_CFLAGS}")
+     ELSE(SNDFILE_FOUND)
+         FIND_PACKAGE(SndFile)
+         IF(SNDFILE_FOUND)
+@@ -237,7 +237,7 @@
+         SET(HAS_VORBISFILE 1)
+         LINK_DIRECTORIES(${VORBISFILE_LIBRARY_DIRS})
+         SET_SOURCE_FILES_PROPERTIES(src/codec_vorbisfile.cpp PROPERTIES
+-                                    COMPILE_FLAGS "${VORBISFILE_CFLAGS}")
++                                    COMPILE_OPTIONS "${VORBISFILE_CFLAGS}")
+     ELSE(VORBISFILE_FOUND)
+         FIND_PACKAGE(OggVorbis)
+         IF(OGGVORBIS_FOUND)
+@@ -258,14 +258,14 @@
+                         SET(VORBISFILE_LIBRARIES "vorbisidec")
+                     ENDIF(HAVE_LIBVORBISIDEC)
+                     SET_SOURCE_FILES_PROPERTIES(src/codec_vorbisfile.cpp PROPERTIES
+-                                                COMPILE_FLAGS "-DHAS_VORBISIDEC")
++                                                COMPILE_OPTIONS "-DHAS_VORBISIDEC")
+                 ENDIF(DYNLOAD OR HAVE_LIBVORBISIDEC)
+             ENDIF(HAVE_TREMOR_IVORBISFILE_H)
+         ELSE(NOT VORBISIDEC_FOUND)
+             SET(HAS_VORBISFILE 1)
+             LINK_DIRECTORIES(${VORBISIDEC_LIBRARY_DIRS})
+             SET_SOURCE_FILES_PROPERTIES(src/codec_vorbisfile.cpp PROPERTIES
+-                                        COMPILE_FLAGS "${VORBISIDEC_CFLAGS} -DHAS_VORBISIDEC")
++                                        COMPILE_OPTIONS "${VORBISIDEC_CFLAGS};-DHAS_VORBISIDEC")
+         ENDIF(NOT VORBISIDEC_FOUND)
+     ENDIF(NOT HAS_VORBISFILE)
+     IF(HAS_VORBISFILE)
+@@ -307,7 +307,7 @@
+         SET(HAS_MPG123 1)
+         LINK_DIRECTORIES(${MPG123_LIBRARY_DIRS})
+         SET_SOURCE_FILES_PROPERTIES(src/codec_mpg123.cpp PROPERTIES
+-                                    COMPILE_FLAGS "${MPG123_CFLAGS}")
++                                    COMPILE_OPTIONS "${MPG123_CFLAGS}")
+     ENDIF(NOT MPG123_FOUND)
+     IF(HAS_MPG123)
+         SET(ALURE_OBJS ${ALURE_OBJS} src/codec_mpg123.cpp)
+@@ -376,7 +376,7 @@
+         SET(HAS_FLUIDSYNTH 1)
+         LINK_DIRECTORIES(${FLUIDSYNTH_LIBRARY_DIRS})
+         SET_SOURCE_FILES_PROPERTIES(src/codec_fluidsynth.cpp PROPERTIES
+-                                    COMPILE_FLAGS "${FLUIDSYNTH_CFLAGS}")
++                                    COMPILE_OPTIONS "${FLUIDSYNTH_CFLAGS}")
+     ENDIF(NOT FLUIDSYNTH_FOUND)
+     IF(HAS_FLUIDSYNTH)
+         SET(ALURE_OBJS ${ALURE_OBJS} src/codec_fluidsynth.cpp)
+@@ -444,7 +444,7 @@
+     #build a static library
+     ADD_LIBRARY(${LIBNAME}-static STATIC ${ALURE_OBJS})
+     SET_TARGET_PROPERTIES(${LIBNAME}-static PROPERTIES DEFINE_SYMBOL ALURE_BUILD_LIBRARY
+-                                                       COMPILE_FLAGS ${STATIC_CFLAGS}
++                                                       COMPILE_OPTIONS "${STATIC_CFLAGS}"
+                                                        VERSION ${LIB_VERSION}.0)
+     INSTALL(TARGETS ${LIBNAME}-static
+             RUNTIME DESTINATION bin
+@@ -460,7 +460,7 @@
+ IF(BUILD_EXAMPLES)
+     IF(HAVE_DDK_NTDDCDRM_H)
+         SET_SOURCE_FILES_PROPERTIES(examples/alurecdplay.c PROPERTIES
+-                                    COMPILE_FLAGS "-DHAVE_DDK_NTDDCDRM_H")
++                                    COMPILE_OPTIONS "-DHAVE_DDK_NTDDCDRM_H")
+     ENDIF(HAVE_DDK_NTDDCDRM_H)
+     ADD_EXECUTABLE(alureplay examples/alureplay.c)
+     ADD_EXECUTABLE(alurecdplay examples/alurecdplay.c)
+@@ -470,9 +470,9 @@
+         TARGET_LINK_LIBRARIES(alurecdplay ${LIBNAME} ${OPENAL_LIBRARIES} ${EXTRA_LIBS})
+         TARGET_LINK_LIBRARIES(alurestream ${LIBNAME} ${OPENAL_LIBRARIES} ${EXTRA_LIBS})
+     ELSE(BUILD_SHARED)
+-        SET_TARGET_PROPERTIES(alureplay PROPERTIES COMPILE_FLAGS -DALURE_STATIC_LIBRARY)
+-        SET_TARGET_PROPERTIES(alurecdplay PROPERTIES COMPILE_FLAGS -DALURE_STATIC_LIBRARY)
+-        SET_TARGET_PROPERTIES(alurestream PROPERTIES COMPILE_FLAGS -DALURE_STATIC_LIBRARY)
++        SET_TARGET_PROPERTIES(alureplay PROPERTIES COMPILE_OPTIONS -DALURE_STATIC_LIBRARY)
++        SET_TARGET_PROPERTIES(alurecdplay PROPERTIES COMPILE_OPTIONS -DALURE_STATIC_LIBRARY)
++        SET_TARGET_PROPERTIES(alurestream PROPERTIES COMPILE_OPTIONS -DALURE_STATIC_LIBRARY)
+         TARGET_LINK_LIBRARIES(alureplay ${LIBNAME}-static ${OPENAL_LIBRARIES} ${EXTRA_LIBS})
+         TARGET_LINK_LIBRARIES(alurecdplay ${LIBNAME}-static ${OPENAL_LIBRARIES} ${EXTRA_LIBS})
+         TARGET_LINK_LIBRARIES(alurestream ${LIBNAME}-static ${OPENAL_LIBRARIES} ${EXTRA_LIBS})