diff --git a/srcpkgs/libopenal/patches/cross.patch b/srcpkgs/libopenal/patches/cross.patch new file mode 100644 index 0000000000..e4390b579c --- /dev/null +++ b/srcpkgs/libopenal/patches/cross.patch @@ -0,0 +1,45 @@ +--- native-tools/CMakeLists.txt 2018-09-06 23:35:18.000000000 +0200 ++++ - 2018-09-28 08:42:55.286878477 +0200 +@@ -27,3 +27,5 @@ + 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 diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template index 58a88e6dad..1da71926f3 100644 --- a/srcpkgs/libopenal/template +++ b/srcpkgs/libopenal/template @@ -1,9 +1,10 @@ # Template file for 'libopenal' pkgname=libopenal -version=1.18.2 -revision=3 -build_style=cmake +version=1.19.0 +revision=1 wrksrc="openal-soft-${version}" +build_style=cmake +configure_args="-DALSASOFT_WANT_SDL2=ON" hostmakedepends="pkg-config" makedepends="alsa-lib-devel pulseaudio-devel SDL2-devel ffmpeg-devel jack-devel" short_desc="A cross-platform 3D audio library" @@ -11,7 +12,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://kcat.strangesoft.net/openal.html" distfiles="http://kcat.strangesoft.net/openal-releases/openal-soft-${version}.tar.bz2" -checksum=9f8ac1e27fba15a59758a13f0c7f6540a0605b6c3a691def9d420570506d7e82 +checksum=f1adf3a6e73e2f9270a0fd00887ea23793968fa787f60dcdec41a3b2f42a0ed6 pre_configure() { case "$XBPS_TARGET_MACHINE" in @@ -21,6 +22,12 @@ 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 @@ -32,6 +39,6 @@ libopenal-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.so + vmove "usr/lib/*.so" } }