diff --git a/srcpkgs/libopenal/patches/cross.patch b/srcpkgs/libopenal/patches/cross.patch deleted file mode 100644 index 80f334a0076..00000000000 --- a/srcpkgs/libopenal/patches/cross.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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) diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template index 29180831583..c89016a3584 100644 --- a/srcpkgs/libopenal/template +++ b/srcpkgs/libopenal/template @@ -1,7 +1,7 @@ # Template file for 'libopenal' pkgname=libopenal -version=1.20.1 -revision=2 +version=1.21.0 +revision=1 wrksrc="openal-soft-${version}" build_style=cmake configure_args="-DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF" @@ -13,7 +13,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://openal-soft.org/" distfiles="http://openal-soft.org/openal-releases/openal-soft-${version}.tar.bz2" -checksum=b6ceb051325732c23f5c8b6d37dbd89534517e6439a87e970882b447c3025d6d +checksum=2916b4fc24e23b0271ce0b3468832ad8b6d8441b1830215b28cc4fee6cc89297 build_options="sndio" build_options_default="sndio" @@ -26,12 +26,6 @@ pre_configure() { esac } -pre_configure() { - cd native-tools - CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake . - make ${makejobs} -} - post_install() { rm -f ${DESTDIR}/usr/share/openal/alsoftrc.sample vsconf alsoftrc.sample