| author | Jan Alexander Steffens (heftig)
<heftig@archlinux.org> 2024-12-31 16:32:01 UTC |
| committer | Jan Alexander Steffens (heftig)
<heftig@archlinux.org> 2024-12-31 16:37:06 UTC |
| parent | fa3b3cf8353ea0bea0c22be640729cb28adf741d |
| .SRCINFO | +10 | -12 |
| 0001-libmikmod-cmake-Install-documentation-and-autoconf-m.patch | +58 | -0 |
| PKGBUILD | +21 | -26 |
| cmake-man.diff | +0 | -11 |
diff --git a/.SRCINFO b/.SRCINFO index 56a1ac0..a598269 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,23 +1,21 @@ pkgbase = libmikmod pkgdesc = Module player library supporting many formats, including MOD, S3M, IT and XM - pkgver = 3.3.11.1 - pkgrel = 7 - url = http://mikmod.sourceforge.net + pkgver = 3.3.12 + pkgrel = 1 + url = https://mikmod.sourceforge.net arch = x86_64 - license = GPL2 - license = LGPL2.1 + license = LGPL-2.0-or-later makedepends = alsa-lib makedepends = cmake + makedepends = git + makedepends = libpulse makedepends = ninja depends = glibc - depends = libpulse depends = sh provides = libmikmod.so - source = https://downloads.sourceforge.net/mikmod/libmikmod-3.3.11.1.tar.gz - source = cmake-man.diff - md5sums = f69d7dd06d307e888f466fc27f4f680b - md5sums = e8a338d92027072971f49b495e87c442 - sha256sums = ad9d64dfc8f83684876419ea7cd4ff4a41d8bcd8c23ef37ecb3a200a16b46d19 - sha256sums = 3331b6ff7f6f3dfd33f543d64affc10a127f61bed1160f75b07344c03f21b840 + source = git+https://git.code.sf.net/p/mikmod/mikmod#tag=libmikmod-3.3.12 + source = 0001-libmikmod-cmake-Install-documentation-and-autoconf-m.patch + b2sums = 5bbade5a17ea7fdb79c27936575cc5ccc70a0581a1a3a88479cc60ca7640dfe6f83d84687024a60a1e79f20fd9d0acab9fef82ee6d9d089017f7dafab6ef27e0 + b2sums = 4c8ddd4bdf0d1a65a8d740ddcfbb227caa456825b9a55b592b8c777899fdd0f20a394c9724b2ea340a4bb2b6328c14926520f407b4e29d8cdc37901547f1d96e pkgname = libmikmod diff --git a/0001-libmikmod-cmake-Install-documentation-and-autoconf-m.patch b/0001-libmikmod-cmake-Install-documentation-and-autoconf-m.patch new file mode 100644 index 0000000..1e00add --- /dev/null +++ b/0001-libmikmod-cmake-Install-documentation-and-autoconf-m.patch @@ -0,0 +1,58 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> +Date: Tue, 31 Dec 2024 17:23:37 +0100 +Subject: [PATCH] libmikmod: cmake: Install documentation and autoconf macro + +--- + libmikmod/CMakeLists.txt | 6 ++++++ + libmikmod/docs/CMakeLists.txt | 10 ++++++++++ + 2 files changed, 16 insertions(+) + +diff --git a/libmikmod/CMakeLists.txt b/libmikmod/CMakeLists.txt +index 189495c54f87..996cfb21dfec 100644 +--- a/libmikmod/CMakeLists.txt ++++ b/libmikmod/CMakeLists.txt +@@ -793,3 +793,9 @@ INSTALL( + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/pkgconfig + ) ++INSTALL( ++ FILES ++ "${PROJECT_SOURCE_DIR}/libmikmod.m4" ++ DESTINATION ++ ${CMAKE_INSTALL_DATAROOTDIR}/aclocal ++) +diff --git a/libmikmod/docs/CMakeLists.txt b/libmikmod/docs/CMakeLists.txt +index 4e6c06d36da5..b18084feaf90 100644 +--- a/libmikmod/docs/CMakeLists.txt ++++ b/libmikmod/docs/CMakeLists.txt +@@ -6,19 +6,29 @@ find_program(MAKEINFO_EXECUTABLE makeinfo) + set(info_in ${CMAKE_CURRENT_SOURCE_DIR}/mikmod.texi) + set(info_out ${CMAKE_CURRENT_BINARY_DIR}/mikmod.info) + set(html_out ${CMAKE_CURRENT_BINARY_DIR}/mikmod.html) ++set(man_out ${CMAKE_CURRENT_BINARY_DIR}/libmikmod-config.1) + + IF (ENABLE_DOC) + add_custom_command(OUTPUT ${info_out} + COMMAND ${MAKEINFO_EXECUTABLE} --no-split -o ${info_out} ${info_in} + DEPENDS ${info_in} + COMMENT "Creating Info file ${info_out}" + VERBATIM) + + add_custom_command(OUTPUT ${html_out} + COMMAND ${MAKEINFO_EXECUTABLE} --no-split --html -o ${html_out} ${info_in} + DEPENDS ${info_in} + COMMENT "Creating HTML file ${html_out}" + VERBATIM) + ++configure_file(libmikmod-config.1.in ${man_out} @ONLY) ++install(FILES ${man_out} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) ++ + add_custom_target(info ALL DEPENDS ${info_out} ${html_out}) ++install(FILES ${info_out} DESTINATION ${CMAKE_INSTALL_INFODIR}) ++install(FILES ${html_out} ++ ${PROJECT_SOURCE_DIR}/NEWS ++ ${PROJECT_SOURCE_DIR}/README ++ ${PROJECT_SOURCE_DIR}/TODO ++ DESTINATION ${CMAKE_INSTALL_DOCDIR}) + ENDIF() diff --git a/PKGBUILD b/PKGBUILD index 8ed372c..06d48a3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,54 +4,49 @@ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libmikmod -pkgver=3.3.11.1 -pkgrel=7 +pkgver=3.3.12 +pkgrel=1 pkgdesc="Module player library supporting many formats, including MOD, S3M, IT and XM" -url="http://mikmod.sourceforge.net" -license=( - GPL2 - LGPL2.1 -) +url="https://mikmod.sourceforge.net" +license=(LGPL-2.0-or-later) arch=(x86_64) depends=( glibc - libpulse sh ) makedepends=( alsa-lib cmake + git + libpulse ninja ) provides=(libmikmod.so) -source=(https://downloads.sourceforge.net/mikmod/libmikmod-$pkgver.tar.gz - cmake-man.diff) -md5sums=('f69d7dd06d307e888f466fc27f4f680b' - 'e8a338d92027072971f49b495e87c442') -sha256sums=('ad9d64dfc8f83684876419ea7cd4ff4a41d8bcd8c23ef37ecb3a200a16b46d19' - '3331b6ff7f6f3dfd33f543d64affc10a127f61bed1160f75b07344c03f21b840') +source=( + "git+https://git.code.sf.net/p/mikmod/mikmod#tag=libmikmod-$pkgver" + 0001-libmikmod-cmake-Install-documentation-and-autoconf-m.patch +) +b2sums=('5bbade5a17ea7fdb79c27936575cc5ccc70a0581a1a3a88479cc60ca7640dfe6f83d84687024a60a1e79f20fd9d0acab9fef82ee6d9d089017f7dafab6ef27e0' + '4c8ddd4bdf0d1a65a8d740ddcfbb227caa456825b9a55b592b8c777899fdd0f20a394c9724b2ea340a4bb2b6328c14926520f407b4e29d8cdc37901547f1d96e') prepare() { - cd libmikmod-$pkgver - patch -Np1 -i ../cmake-man.diff + cd mikmod + git apply -3 ../0001-libmikmod-cmake-Install-documentation-and-autoconf-m.patch } build() { - cmake -S libmikmod-$pkgver -B build -G Ninja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None \ - -DENABLE_DL=1 + local cmake_options=( + -D CMAKE_BUILD_TYPE=None + -D CMAKE_INSTALL_PREFIX=/usr + -D ENABLE_DL=1 + ) + + cmake -S mikmod/libmikmod -B build -G Ninja "${cmake_options[@]}" cmake --build build } package() { DESTDIR="$pkgdir" cmake --install build - - install -Dt "$pkgdir/usr/share/aclocal" -m644 libmikmod-$pkgver/libmikmod.m4 - install -Dt "$pkgdir/usr/share/doc/$pkgname" -m644 \ - libmikmod-$pkgver/{NEWS,README,TODO} build/docs/mikmod.html - install -Dt "$pkgdir/usr/share/info" build/docs/mikmod.info - install -Dt "$pkgdir/usr/share/man/man1" build/docs/libmikmod-config.1 } # vim:set sw=2 sts=-1 et: diff --git a/cmake-man.diff b/cmake-man.diff deleted file mode 100644 index 9cc6b44..0000000 --- a/cmake-man.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r libmikmod-3.3.11.1/docs/CMakeLists.txt libmikmod-3.3.11.1-man/docs/CMakeLists.txt ---- libmikmod-3.3.11.1/docs/CMakeLists.txt 2014-07-10 07:37:00.000000000 +0000 -+++ libmikmod-3.3.11.1-man/docs/CMakeLists.txt 2020-01-11 18:54:48.154853499 +0000 -@@ -20,5 +20,7 @@ - COMMENT "Creating HTML file ${html_out}" - VERBATIM) - -+configure_file(libmikmod-config.1.in libmikmod-config.1 @ONLY) -+ - add_custom_target(info ALL DEPENDS ${info_out} ${html_out}) - ENDIF(ENABLE_DOC)