Skip to content
Permalink
Browse files

libopenal: update to 1.20.0.

  • Loading branch information
avoidr authored and Hoshpak committed Dec 3, 2019
1 parent bd8c9fc commit 993a013b6215076a909965ff7123d8e58d3169a2
Showing with 33 additions and 43 deletions.
  1. +30 −40 srcpkgs/libopenal/patches/cross.patch
  2. +3 −3 srcpkgs/libopenal/template
@@ -1,45 +1,35 @@
--- native-tools/CMakeLists.txt 2018-09-06 23:35:18.000000000 +0200
+++ - 2018-09-28 08:42:55.286878477 +0200
@@ -27,3 +27,5 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -1089,19 +1089,11 @@ ELSE()
SET(NATIVE_BIN_DIR "${OpenAL_BINARY_DIR}/native-tools")
FILE(MAKE_DIRECTORY "${NATIVE_BIN_DIR}")

- SET(BIN2H_COMMAND "${NATIVE_BIN_DIR}/bin2h")
- SET(BSINCGEN_COMMAND "${NATIVE_BIN_DIR}/bsincgen")
- ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${NATIVE_SRC_DIR}"
- COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
- COMMAND ${CMAKE_COMMAND} --build . --config "Release"
- WORKING_DIRECTORY "${NATIVE_BIN_DIR}"
- DEPENDS "${NATIVE_SRC_DIR}/CMakeLists.txt"
- IMPLICIT_DEPENDS
- C "${NATIVE_SRC_DIR}/bin2h.c"
- C "${NATIVE_SRC_DIR}/bsincgen.c"
- VERBATIM
- )
+ set(IMPORT_EXECUTABLES "native-tools/ImportNativeToools.cmake" CACHE FILEPATH "POINT")
+ INCLUDE(${IMPORT_EXECUTABLES})
+
+ SET(BIN2H_COMMAND bin2h)
+ SET(BSINCGEN_COMMAND bsincgen)
ENDIF()
ADD_CUSTOM_TARGET(native-tools
DEPENDS "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
--- native-tools/CMakeLists.txt
+++ native-tools/CMakeLists.txt
@@ -27,3 +27,5 @@ target_compile_definitions(bsincgen PRIVATE ${CPP_DEFS})
if(HAVE_LIBM)
target_link_libraries(bsincgen m)
endif(HAVE_LIBM)
+
+export(TARGETS bin2h bsincgen FILE ${CMAKE_BINARY_DIR}/ImportNativeToools.cmake)
--- CMakeLists.txt 2018-09-06 23:35:18.000000000 +0200
+++ - 2018-09-28 09:04:44.686306302 +0200
@@ -1285,18 +1285,11 @@
SET(NATIVE_BIN_DIR "${OpenAL_BINARY_DIR}/native-tools/")
FILE(MAKE_DIRECTORY "${NATIVE_BIN_DIR}")

+set(IMPORT_EXECUTABLES "native-tools/ImportNativeToools.cmake" CACHE FILEPATH "POINT")
+INCLUDE(${IMPORT_EXECUTABLES})
+
SET(BIN2H_COMMAND "${NATIVE_BIN_DIR}bin2h")
SET(BSINCGEN_COMMAND "${NATIVE_BIN_DIR}bsincgen")
-ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${NATIVE_SRC_DIR}"
- COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
- COMMAND ${CMAKE_COMMAND} --build . --config "Release"
- WORKING_DIRECTORY "${NATIVE_BIN_DIR}"
- DEPENDS "${NATIVE_SRC_DIR}CMakeLists.txt"
- IMPLICIT_DEPENDS C "${NATIVE_SRC_DIR}bin2h.c"
- C "${NATIVE_SRC_DIR}bsincgen.c"
- VERBATIM
-)
ADD_CUSTOM_TARGET(native-tools
DEPENDS "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
VERBATIM
--- CMakeLists.txt 2018-09-28 09:04:46.096049994 +0200
+++ - 2018-09-28 09:05:29.775626902 +0200
@@ -1288,8 +1288,8 @@
set(IMPORT_EXECUTABLES "native=tools/ImportNativeTools.cmake" CACHE FILEPATH "POINT")
INCLUDE(${IMPORT_EXECUTABLES})

-SET(BIN2H_COMMAND "${NATIVE_BIN_DIR}bin2h")
-SET(BSINCGEN_COMMAND "${NATIVE_BIN_DIR}bsincgen")
+SET(BIN2H_COMMAND bin2h)
+SET(BSINCGEN_COMMAND bsincgen)
ADD_CUSTOM_TARGET(native-tools
DEPENDS "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
VERBATIM
@@ -1,7 +1,7 @@
# Template file for 'libopenal'
pkgname=libopenal
version=1.19.1
revision=2
version=1.20.0
revision=1
wrksrc="openal-soft-${version}"
build_style=cmake
configure_args="-DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="http://openal-soft.org/"
distfiles="http://openal-soft.org/openal-releases/openal-soft-${version}.tar.bz2"
checksum=5c2f87ff5188b95e0dc4769719a9d89ce435b8322b4478b95dd4b427fe84b2e9
checksum=c089497922b454baf96d5e4bbc1a114cf75c56b44801edc48b9b82ab5ed1e60e

build_options="sndio"
build_options_default="sndio"

0 comments on commit 993a013

Please sign in to comment.
You can’t perform that action at this time.