Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

openal: Update to 1.21.0

Browse Source
This commit is contained in:
Alexey Pavlov 2021-01-18 09:58:49 +03:00
parent 9e21033a7d
commit 096a8f320c
6 changed files with 91 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mingw-w64-openal/0001-versioned-w32-dll.mingw.patch
View File

@ -1,14 +1,14 @@
--- openal-soft-1.18.1/CMakeLists.txt.orig 2017-08-15 10:18:37.065522000 +0200 --- openal-soft-1.21.0/CMakeLists.txt.orig 2017-08-15 10:18:37.065522000 +0200
+++ openal-soft-1.18.1/CMakeLists.txt 2017-08-15 10:18:58.438744500 +0200 +++ openal-soft-1.21.0/CMakeLists.txt 2017-08-15 10:18:58.438744500 +0200
@@ -1233,7 +1233,10 @@ @@ -1257,7 +1257,10 @@
add_library(${IMPL_TARGET} SHARED ${OPENAL_OBJS} ${ALC_OBJS} ${RC_CONFIG}
ADD_LIBRARY(${IMPL_TARGET} SHARED ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS}) ${TARGET_PUBLIC_HEADERS})
IF(WIN32) if(WIN32)
- SET_TARGET_PROPERTIES(${IMPL_TARGET} PROPERTIES PREFIX "") - set_target_properties(${IMPL_TARGET} PROPERTIES PREFIX "")
+ SET_TARGET_PROPERTIES(OpenAL PROPERTIES + set_target_properties(${IMPL_TARGET} PROPERTIES
+ OUTPUT_NAME openal + OUTPUT_NAME openal
+ RUNTIME_OUTPUT_NAME openal-${LIB_MAJOR_VERSION} + RUNTIME_OUTPUT_NAME openal-${LIB_MAJOR_VERSION}
+ ARCHIVE_OUTPUT_NAME openal) + ARCHIVE_OUTPUT_NAME openal)
ENDIF() endif()
ENDIF() target_link_libraries(${IMPL_TARGET} PRIVATE common ${LINKER_FLAGS} ${EXTRA_LIBS} ${MATH_LIB})
SET_TARGET_PROPERTIES(${IMPL_TARGET} PROPERTIES OUTPUT_NAME ${LIBNAME}

24
mingw-w64-openal/0003-openal-not-32.mingw.patch
View File

@ -1,15 +1,11 @@
--- openal-soft-1.18.0/CMakeLists.txt.orig 2017-06-09 09:58:31.540585400 +0200 --- openal-soft-1.21.0/CMakeLists.txt.orig 2017-06-09 09:58:31.540585400 +0200
+++ openal-soft-1.18.0/CMakeLists.txt 2017-06-09 10:00:24.729585500 +0200 +++ openal-soft-1.21.0/CMakeLists.txt 2017-06-09 10:00:24.729585500 +0200
@@ -1152,7 +1152,11 @@ @@ -1155,7 +1155,7 @@
IF(NOT WIN32) endif()
SET(LIBNAME "openal") endif()
ELSE()
- SET(LIBNAME "OpenAL32")
+ IF(MINGW)
+ SET(LIBNAME "openal")
+ ELSE()
+ SET(LIBNAME "OpenAL32")
+ ENDIF()
ENDIF()
FIND_PACKAGE(Git) -if(NOT WIN32)
+if(NOT MSVC)
set(LIBNAME "openal")
else()
set(LIBNAME "OpenAL32")

28
mingw-w64-openal/0004-disable-OSS-windows.patch
View File

@ -1,18 +1,18 @@
--- openal-soft-1.16.0/CMakeLists.txt.orig 2015-11-03 09:47:33.546783000 +0300 --- openal-soft-1.21.0/CMakeLists.txt.orig 2015-11-03 09:47:33.546783000 +0300
+++ openal-soft-1.16.0/CMakeLists.txt 2015-11-03 09:48:28.685268600 +0300 +++ openal-soft-1.21.0/CMakeLists.txt 2015-11-03 09:48:28.685268600 +0300
@@ -758,6 +758,7 @@ @@ -825,6 +825,7 @@
# Check OSS backend # Check OSS backend
OPTION(ALSOFT_REQUIRE_OSS "Require OSS backend" OFF) option(ALSOFT_REQUIRE_OSS "Require OSS backend" OFF)
+IF(NOT WIN32) +if(NOT WIN32)
FIND_PACKAGE(OSS) find_package(OSS)
IF(OSS_FOUND) if(OSS_FOUND)
OPTION(ALSOFT_BACKEND_OSS "Enable OSS backend" ON) option(ALSOFT_BACKEND_OSS "Enable OSS backend" ON)
@@ -773,6 +774,7 @@ @@ -841,6 +842,7 @@
IF(ALSOFT_REQUIRE_OSS AND NOT HAVE_OSS) if(ALSOFT_REQUIRE_OSS AND NOT HAVE_OSS)
MESSAGE(FATAL_ERROR "Failed to enabled required OSS backend") message(FATAL_ERROR "Failed to enabled required OSS backend")
ENDIF() endif()
+ENDIF() +endif()
# Check Solaris backend # Check Solaris backend
OPTION(ALSOFT_REQUIRE_SOLARIS "Require Solaris backend" OFF) option(ALSOFT_REQUIRE_SOLARIS "Require Solaris backend" OFF)

40
mingw-w64-openal/0005-mingw-dont-check-libm.patch
View File

@ -1,38 +1,26 @@
--- openal-soft-openal-soft-1.20.1/CMakeLists.txt.orig 2020-03-04 12:52:14.862006000 +0300 --- openal-soft-openal-soft-1.21.0/CMakeLists.txt.orig 2020-03-04 12:52:14.862006000 +0300
+++ openal-soft-openal-soft-1.20.1/CMakeLists.txt 2020-03-04 12:52:40.355186300 +0300 +++ openal-soft-openal-soft-1.21.0/CMakeLists.txt 2020-03-04 12:52:40.355186300 +0300
@@ -384,11 +384,13 @@ @@ -429,11 +429,13 @@
# Some systems need libm for some math functions to work # Some systems need libm for some math functions to work
SET(MATH_LIB ) set(MATH_LIB )
+IF(NOT MINGW) +if(NOT MINGW)
CHECK_LIBRARY_EXISTS(m pow "" HAVE_LIBM) check_library_exists(m pow "" HAVE_LIBM)
IF(HAVE_LIBM) if(HAVE_LIBM)
SET(MATH_LIB ${MATH_LIB} m) set(MATH_LIB ${MATH_LIB} m)
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} m) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} m)
ENDIF() endif()
+ENDIF() +endif()
# Some systems need to link with -lrt for clock_gettime as used by the common # Some systems need to link with -lrt for clock_gettime as used by the common
# eaxmple functions. # eaxmple functions.
--- openal-soft-openal-soft-1.20.1/native-tools/CMakeLists.txt.orig 2020-03-04 13:37:14.222573100 +0300 --- openal-soft-openal-soft-1.21.0/cmake/FindMySOFA.cmake.orig 2020-03-04 13:48:39.214749300 +0300
+++ openal-soft-openal-soft-1.20.1/native-tools/CMakeLists.txt 2020-03-04 13:37:36.875492600 +0300 +++ openal-soft-openal-soft-1.21.0/cmake/FindMySOFA.cmake 2020-03-04 13:49:02.945683400 +0300
@@ -9,7 +9,9 @@
set(CPP_DEFS ${CPP_DEFS} _WIN32)
endif(WIN32)
+if (NOT MINGW)
check_library_exists(m pow "" HAVE_LIBM)
+endif()
add_executable(bin2h bin2h.c)
# Enforce no dressing for executable names, so the main script can find it
--- openal-soft-openal-soft-1.20.1/cmake/FindMySOFA.cmake.orig 2020-03-04 13:48:39.214749300 +0300
+++ openal-soft-openal-soft-1.20.1/cmake/FindMySOFA.cmake 2020-03-04 13:49:02.945683400 +0300
@@ -49,9 +49,11 @@ @@ -49,9 +49,11 @@
DOC "The MySOFA library" DOC "The MySOFA library"
) )
+if (NOT MINGW) +if(NOT MINGW)
find_library(MYSOFA_M_LIBRARY NAMES m find_library(MYSOFA_M_LIBRARY NAMES m
DOC "The math library for MySOFA" DOC "The math library for MySOFA"
) )

48
mingw-w64-openal/0006-mingw-use-own-import-library-winmm.patch
View File

@ -1,29 +1,27 @@
--- openal-soft-openal-soft-1.20.1/CMakeLists.txt.orig 2020-03-05 11:45:03.064395200 +0300 --- openal-soft-openal-soft-1.21.0/CMakeLists.txt.orig 2020-03-05 11:45:03.064395200 +0300
+++ openal-soft-openal-soft-1.20.1/CMakeLists.txt 2020-03-05 11:49:21.032159600 +0300 +++ openal-soft-openal-soft-1.21.0/CMakeLists.txt 2020-03-05 11:49:21.032159600 +0300
@@ -860,20 +860,26 @@ @@ -884,11 +884,13 @@
IF(WIN32) if(WIN32)
SET(WINSDK_LIB_DIRS ) set(WINSDK_LIB_DIRS )
SET(WINSDK_INCLUDE_DIRS ) set(WINSDK_INCLUDE_DIRS )
+ IF(MSVC) + if(MSVC)
FIND_PACKAGE(WindowsSDK) find_package(WindowsSDK)
IF(WINDOWSSDK_FOUND) if(WINDOWSSDK_FOUND)
get_windowssdk_library_dirs(${WINDOWSSDK_PREFERRED_DIR} WINSDK_LIB_DIRS) get_windowssdk_library_dirs(${WINDOWSSDK_PREFERRED_DIR} WINSDK_LIB_DIRS)
get_windowssdk_include_dirs(${WINDOWSSDK_PREFERRED_DIR} WINSDK_INCLUDE_DIRS) get_windowssdk_include_dirs(${WINDOWSSDK_PREFERRED_DIR} WINSDK_INCLUDE_DIRS)
ENDIF() endif()
+ ENDIF() + endif()
SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502)
# Check MMSystem backend # Check MMSystem backend
CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H) check_include_files("windows.h;mmsystem.h" HAVE_MMSYSTEM_H)
+ IF(MSVC) --- openal-soft-openal-soft-1.21.0/cmake/FindDSound.cmake.orig 2020-03-05 11:45:03.064395200 +0300
FIND_LIBRARY(WINMM_LIBRARY NAMES winmm +++ openal-soft-openal-soft-1.21.0/cmake/FindDSound.cmake 2020-03-05 11:49:21.032159600 +0300
PATHS ${WINSDK_LIB_DIRS} @@ -8,7 +8,7 @@
PATH_SUFFIXES lib lib/x86 lib/x64) # DSOUND_LIBRARY - the dsound library
+ ELSE() #
+ SET(WINMM_LIBRARY winmm)
+ ENDIF() -if (WIN32)
IF(HAVE_MMSYSTEM_H AND WINMM_LIBRARY) +if (MSVC)
OPTION(ALSOFT_BACKEND_WINMM "Enable Windows Multimedia backend" ON) FIND_PACKAGE(WindowsSDK)
IF(ALSOFT_BACKEND_WINMM) if (WINDOWSSDK_FOUND)
get_windowssdk_library_dirs(${WINDOWSSDK_PREFERRED_DIR} WINSDK_LIB_DIRS)

27
mingw-w64-openal/PKGBUILD
View File

@ -3,8 +3,8 @@
_realname=openal _realname=openal
pkgbase=mingw-w64-${_realname} pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.20.1 pkgver=1.21.0
pkgrel=2 pkgrel=1
pkgdesc="OpenAL audio library for use with opengl (mingw-w64)" pkgdesc="OpenAL audio library for use with opengl (mingw-w64)"
arch=('any') arch=('any')
url="https://github.com/kcat/openal-soft" url="https://github.com/kcat/openal-soft"
@ -22,13 +22,13 @@ source=(https://github.com/kcat/openal-soft/archive/openal-soft-${pkgver}.tar.gz
0004-disable-OSS-windows.patch 0004-disable-OSS-windows.patch
0005-mingw-dont-check-libm.patch 0005-mingw-dont-check-libm.patch
0006-mingw-use-own-import-library-winmm.patch) 0006-mingw-use-own-import-library-winmm.patch)
sha256sums=('c32d10473457a8b545aab50070fe84be2b5b041e1f2099012777ee6be0057c13' sha256sums=('cd3650530866f3906058225f4bfbe0052be19e0a29dcc6df185a460f9948feec'
'a594fade14f742ad203ec7c995e9e4772e15f133067c2d37cc9477b8c9787d5c' 'c3e56b5594ada0b95588373bd8ca062677805beae393c6551301518ab24a0cd3'
'f0bde7d3a8087530ab1bb2f48e59eec6f4cf60d59c5afe3a0c28c95e6b138751' 'f0bde7d3a8087530ab1bb2f48e59eec6f4cf60d59c5afe3a0c28c95e6b138751'
'93894676b54415ce9d5c8c75eea28730845ecacfd0726bede2f459ed136da080' '33dccfc603a48d265341e60bc801976d077e546ab5c91a93e8426eac01bb7ad4'
'aa6fc2efb76424d0337d609f3002abb8ff179ed15ae633c53433bcb176e643ba' '8b8ff007d224a5267aead184dc6d24317e40be69c91064cdfdc35b78bb762cc6'
'd25ea2d6d7ee3995a0648f725edd1bfde71bb1a07c91886a1572390ee03f3d00' 'c2528ecc034ea993cb63893b3f2ce5ceeac8d63295decf6864f58cd646c74299'
'099f112cfa188f84a60570fdb9146baa6966e15b8739db83e605050acdc8cb4d') '581af86e2191957bd8a8e5c6813a20c42eafeb82c2f2eb1c170f94507aa3fd5c')
prepare() { prepare() {
cd openal-soft-openal-soft-${pkgver} cd openal-soft-openal-soft-${pkgver}
@ -41,6 +41,13 @@ prepare() {
} }
build() { build() {
declare -a extra_config
if check_option "debug" "n"; then
extra_config+=("-DCMAKE_BUILD_TYPE=Release")
else
extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
fi
[[ -d "${srcdir}"/shared-${MINGW_CHOST} ]] && rm -rf ${srcdir}/shared-${MINGW_CHOST} [[ -d "${srcdir}"/shared-${MINGW_CHOST} ]] && rm -rf ${srcdir}/shared-${MINGW_CHOST}
mkdir -p "${srcdir}/shared-${MINGW_CHOST}" && cd "${srcdir}/shared-${MINGW_CHOST}" mkdir -p "${srcdir}/shared-${MINGW_CHOST}" && cd "${srcdir}/shared-${MINGW_CHOST}"
@ -49,12 +56,14 @@ build() {
${MINGW_PREFIX}/bin/cmake \ ${MINGW_PREFIX}/bin/cmake \
-G"MSYS Makefiles" \ -G"MSYS Makefiles" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
"${extra_config[@]}" \
-DALSOFT_EXAMPLES=OFF \ -DALSOFT_EXAMPLES=OFF \
-DALSOFT_UTILS=ON \ -DALSOFT_UTILS=ON \
-DALSOFT_NO_CONFIG_UTIL=ON \ -DALSOFT_NO_CONFIG_UTIL=ON \
-DLIBTYPE=SHARED \ -DLIBTYPE=SHARED \
-DDSOUND_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \ -DDSOUND_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \
-DDSOUND_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libdsound.a \ -DDSOUND_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libdsound.a \
-DWINMM_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libwinmm.a \
../openal-soft-openal-soft-${pkgver} ../openal-soft-openal-soft-${pkgver}
make make
@ -67,12 +76,14 @@ build() {
${MINGW_PREFIX}/bin/cmake \ ${MINGW_PREFIX}/bin/cmake \
-G"MSYS Makefiles" \ -G"MSYS Makefiles" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
"${extra_config[@]}" \
-DALSOFT_EXAMPLES=OFF \ -DALSOFT_EXAMPLES=OFF \
-DALSOFT_UTILS=OFF \ -DALSOFT_UTILS=OFF \
-DALSOFT_NO_CONFIG_UTIL=ON \ -DALSOFT_NO_CONFIG_UTIL=ON \
-DLIBTYPE=STATIC \ -DLIBTYPE=STATIC \
-DDSOUND_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \ -DDSOUND_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \
-DDSOUND_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libdsound.a \ -DDSOUND_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libdsound.a \
-DWINMM_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libwinmm.a \
../openal-soft-openal-soft-${pkgver} ../openal-soft-openal-soft-${pkgver}
make make
} }