commit f5e8b23065c6732080ae0f516ea2576a4f1deffe Author: John McQuah <jmcquah@disroot.org> Date: Thu Mar 2 22:39:25 2023 -0500 sdl2_{image,mixer,net,ttf}: adopted, new build system cmake/ninja diff --git a/sdl2_image/.footprint b/sdl2_image/.footprint index a8cf66681..f50505e1f 100644 --- a/sdl2_image/.footprint +++ b/sdl2_image/.footprint @@ -5,12 +5,15 @@ drwxr-xr-x root/root usr/include/SDL2/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cmake/ drwxr-xr-x root/root usr/lib/cmake/SDL2_image/ --rw-r--r-- root/root usr/lib/cmake/SDL2_image/sdl2_image-config-version.cmake --rw-r--r-- root/root usr/lib/cmake/SDL2_image/sdl2_image-config.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_image/Findlibjxl.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_image/Findwebp.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_image/SDL2_image-shared-targets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_image/SDL2_image-shared-targets.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_image/SDL2_imageConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_image/SDL2_imageConfigVersion.cmake +lrwxrwxrwx root/root usr/lib/libSDL2_image-2.0.so -> libSDL2_image-2.0.so.0 lrwxrwxrwx root/root usr/lib/libSDL2_image-2.0.so.0 -> libSDL2_image-2.0.so.0.600.3 -rwxr-xr-x root/root usr/lib/libSDL2_image-2.0.so.0.600.3 --rw-r--r-- root/root usr/lib/libSDL2_image.a --rwxr-xr-x root/root usr/lib/libSDL2_image.la -lrwxrwxrwx root/root usr/lib/libSDL2_image.so -> libSDL2_image-2.0.so.0.600.3 +lrwxrwxrwx root/root usr/lib/libSDL2_image.so -> libSDL2_image-2.0.so.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/SDL2_image.pc diff --git a/sdl2_image/.signature b/sdl2_image/.signature index e8e83fa4e..47b755e4c 100644 --- a/sdl2_image/.signature +++ b/sdl2_image/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33XsWc9ylxsfcm+y/Jw4w35kXnidz8pNtyOIZhGG4jMmCWZQ6LXfhccqDPtiU3XriumVd9egPuV9FMlAYWDT1gs= -SHA256 (Pkgfile) = cb6bdcc8cd151ac100e61e32cff4f6ced997a859f41e057ed742224dbce50523 -SHA256 (.footprint) = a468e263841bc402e5cf8fb55b731041e37acb5dff838eec60abe45001fd3813 +RWSagIOpLGJF3yFIqwNtjQKeEoA3tLImf35gqcO2psMbl0j06NBz2SdoOhKJWqjYU2+/Fwhk6AucB0Kq4OaSxfTfCwLlgNPtVAU= +SHA256 (Pkgfile) = 4552c6034c7e25b644656de71a099fc5f47b6c99a25fba1fde84c285852cbe60 +SHA256 (.footprint) = 0f5af50d43f04eef6cbf67d73b48eebaac0816300d43e3f793cc27c3af76db00 SHA256 (SDL2_image-2.6.3.tar.gz) = 931c9be5bf1d7c8fae9b7dc157828b7eee874e23c7f24b44ba7eff6b4836312c diff --git a/sdl2_image/Pkgfile b/sdl2_image/Pkgfile index 02556c9ea..098f4d2f6 100644 --- a/sdl2_image/Pkgfile +++ b/sdl2_image/Pkgfile @@ -1,23 +1,23 @@ # Description: SDL_image is an image file loading library. # URL: https://github.com/libsdl-org/SDL_image -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: libsdl2 libwebp name=sdl2_image version=2.6.3 -release=1 +release=2 source=(https://github.com/libsdl-org/SDL_image/releases/download/release-$version/S...) build() { - cd SDL2_image-$version + cmake -S SDL2_image-$version -B build -G Ninja \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" - ./configure \ - --prefix=/usr \ - --disable-jpg-shared \ - --disable-png-shared \ - --disable-tif-shared \ - --disable-webp-shared + ninja -C build -j ${JOBS:-1} + DESTDIR=$PKG ninja -C build install - make - make DESTDIR=$PKG install + # delete installed license.txt + rm -rf $PKG/usr/share } diff --git a/sdl2_mixer/.footprint b/sdl2_mixer/.footprint index d04d21445..2a0b39907 100644 --- a/sdl2_mixer/.footprint +++ b/sdl2_mixer/.footprint @@ -5,12 +5,13 @@ drwxr-xr-x root/root usr/include/SDL2/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cmake/ drwxr-xr-x root/root usr/lib/cmake/SDL2_mixer/ --rw-r--r-- root/root usr/lib/cmake/SDL2_mixer/sdl2_mixer-config-version.cmake --rw-r--r-- root/root usr/lib/cmake/SDL2_mixer/sdl2_mixer-config.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_mixer/SDL2_mixer-shared-targets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_mixer/SDL2_mixer-shared-targets.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_mixer/SDL2_mixerConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_mixer/SDL2_mixerConfigVersion.cmake +lrwxrwxrwx root/root usr/lib/libSDL2_mixer-2.0.so -> libSDL2_mixer-2.0.so.0 lrwxrwxrwx root/root usr/lib/libSDL2_mixer-2.0.so.0 -> libSDL2_mixer-2.0.so.0.600.3 -rwxr-xr-x root/root usr/lib/libSDL2_mixer-2.0.so.0.600.3 --rw-r--r-- root/root usr/lib/libSDL2_mixer.a --rwxr-xr-x root/root usr/lib/libSDL2_mixer.la -lrwxrwxrwx root/root usr/lib/libSDL2_mixer.so -> libSDL2_mixer-2.0.so.0.600.3 +lrwxrwxrwx root/root usr/lib/libSDL2_mixer.so -> libSDL2_mixer-2.0.so.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/SDL2_mixer.pc diff --git a/sdl2_mixer/.signature b/sdl2_mixer/.signature index d20413011..f115e942a 100644 --- a/sdl2_mixer/.signature +++ b/sdl2_mixer/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF364Yt9v/DpXFKzoWSoujfnQWKvU4NcQys8LuxPeKYkhmcy3srkqDRCRVAtPmZ8CoExUS55YksS54c9wVF+QUyAI= -SHA256 (Pkgfile) = 1b417ac9386da8f474425280b7e4e9a97604ae32168f0d1185efbfbcf7360e7b -SHA256 (.footprint) = cda853e666c8fdbf042b942a4a9983231a369dba0bd07ac5acf10893578791ef +RWSagIOpLGJF31FebOVvtkjlR4v60Fj6xB59/C4M7mTl7yt1TsPfqRVxqTtJFhPNSHd30YfpyJwViNbYfl36tE1H41gflhekdAw= +SHA256 (Pkgfile) = 9a23f4011786f013a2a61dfb849d327af2cde84ffb8f3be7a3798b1c832efb0f +SHA256 (.footprint) = 111b662e86102cd4c1ca88a8f8081ae2a68bf2ccf78a53eb4ddf7da9886007b2 SHA256 (SDL2_mixer-2.6.3.tar.gz) = 7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f diff --git a/sdl2_mixer/Pkgfile b/sdl2_mixer/Pkgfile index a4bc3608d..1ed1943c2 100644 --- a/sdl2_mixer/Pkgfile +++ b/sdl2_mixer/Pkgfile @@ -1,19 +1,26 @@ # Description: A sample multi-channel audio mixer library. # URL: https://github.com/libsdl-org/SDL_mixer -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: libvorbis libmodplug flac libsdl2 mpg123 +# Optional: fluidsynth name=sdl2_mixer version=2.6.3 -release=1 +release=2 source=(https://github.com/libsdl-org/SDL_mixer/releases/download/release-$version/S...) build() { - cd SDL2_mixer-$version + prt-get isinst fluidsynth \ + || PKGMK_SDLMIX="-D SDL2MIXER_MIDI_FLUIDSYNTH=OFF" + cmake -S SDL2_mixer-$version -B build -G Ninja \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" $PKGMK_SDLMIX - CONFIG_SHELL=/bin/bash ./configure \ - --prefix=/usr + ninja -C build -j ${JOBS:-1} + DESTDIR=$PKG ninja -C build install - make - make DESTDIR=$PKG install + # delete installed license.txt + rm -rf $PKG/usr/share } diff --git a/sdl2_net/.footprint b/sdl2_net/.footprint index 92936ba9d..e63235171 100644 --- a/sdl2_net/.footprint +++ b/sdl2_net/.footprint @@ -5,11 +5,13 @@ drwxr-xr-x root/root usr/include/SDL2/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cmake/ drwxr-xr-x root/root usr/lib/cmake/SDL2_net/ --rw-r--r-- root/root usr/lib/cmake/SDL2_net/sdl2_net-config-version.cmake --rw-r--r-- root/root usr/lib/cmake/SDL2_net/sdl2_net-config.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_net/SDL2_net-shared-targets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_net/SDL2_net-shared-targets.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_net/SDL2_netConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_net/SDL2_netConfigVersion.cmake +lrwxrwxrwx root/root usr/lib/libSDL2_net-2.0.so -> libSDL2_net-2.0.so.0 lrwxrwxrwx root/root usr/lib/libSDL2_net-2.0.so.0 -> libSDL2_net-2.0.so.0.200.0 -rwxr-xr-x root/root usr/lib/libSDL2_net-2.0.so.0.200.0 --rwxr-xr-x root/root usr/lib/libSDL2_net.la -lrwxrwxrwx root/root usr/lib/libSDL2_net.so -> libSDL2_net-2.0.so.0.200.0 +lrwxrwxrwx root/root usr/lib/libSDL2_net.so -> libSDL2_net-2.0.so.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/SDL2_net.pc diff --git a/sdl2_net/.signature b/sdl2_net/.signature index 71cc657fd..52293ddff 100644 --- a/sdl2_net/.signature +++ b/sdl2_net/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wL7AUkfvYnf8S8KI8KSX1REHJfJI/z1YGGEMWM8VzeoVyP1TTUGm6kJ4KEMdZ3xfJf6cNrYjWwF/T+I8ypEBAY= -SHA256 (Pkgfile) = e813ec55c3ef3c819ea6324507aa7d9343bcf2750d816028cbd2aef74eecd095 -SHA256 (.footprint) = 79524fe9d0a9f747870c02684ef534a7e7a258771ac22624af0c363b8035daf2 +RWSagIOpLGJF34yg7cYsyg8PfUng1wH4wkcekX8ILDO14wnnJGF8FmFVeHkom4l3uBiHLIg/IRLg2t85UV0y+jSGFuwulQ0LwAI= +SHA256 (Pkgfile) = db3f7f67bc657c1b16df1182727bf84d62bc2e1dd6716f75ba35cc920346eafd +SHA256 (.footprint) = ccb409337b590ab71809f747119199cee0c93c9182ec28f9886515389778c41e SHA256 (SDL2_net-2.2.0.tar.gz) = 4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb diff --git a/sdl2_net/Pkgfile b/sdl2_net/Pkgfile index 820dc66bb..2a0f3fa6d 100644 --- a/sdl2_net/Pkgfile +++ b/sdl2_net/Pkgfile @@ -1,19 +1,23 @@ # Description: A cross-platform networking library for SDL2. # URL: https://www.libsdl.org/projects/SDL_net/ -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: libsdl2 name=sdl2_net version=2.2.0 -release=1 +release=2 source=(https://www.libsdl.org/projects/SDL_net/release/SDL2_net-$version.tar.gz) build() { - cd SDL2_net-$version - ./configure --prefix=/usr \ - --disable-examples \ - --disable-static \ - --disable-sdltest - make - make DESTDIR=$PKG install + cmake -S SDL2_net-$version -B build -G Ninja \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" + + ninja -C build -j ${JOBS:-1} + DESTDIR=$PKG ninja -C build install + + # delete installed license.txt + rm -rf $PKG/usr/share } diff --git a/sdl2_ttf/.footprint b/sdl2_ttf/.footprint index 79877e00a..794a8ff22 100644 --- a/sdl2_ttf/.footprint +++ b/sdl2_ttf/.footprint @@ -5,12 +5,13 @@ drwxr-xr-x root/root usr/include/SDL2/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cmake/ drwxr-xr-x root/root usr/lib/cmake/SDL2_ttf/ --rw-r--r-- root/root usr/lib/cmake/SDL2_ttf/sdl2_ttf-config-version.cmake --rw-r--r-- root/root usr/lib/cmake/SDL2_ttf/sdl2_ttf-config.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_ttf/SDL2_ttf-shared-targets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_ttf/SDL2_ttf-shared-targets.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_ttf/SDL2_ttfConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/SDL2_ttf/SDL2_ttfConfigVersion.cmake +lrwxrwxrwx root/root usr/lib/libSDL2_ttf-2.0.so -> libSDL2_ttf-2.0.so.0 lrwxrwxrwx root/root usr/lib/libSDL2_ttf-2.0.so.0 -> libSDL2_ttf-2.0.so.0.2000.2 -rwxr-xr-x root/root usr/lib/libSDL2_ttf-2.0.so.0.2000.2 --rw-r--r-- root/root usr/lib/libSDL2_ttf.a --rwxr-xr-x root/root usr/lib/libSDL2_ttf.la -lrwxrwxrwx root/root usr/lib/libSDL2_ttf.so -> libSDL2_ttf-2.0.so.0.2000.2 +lrwxrwxrwx root/root usr/lib/libSDL2_ttf.so -> libSDL2_ttf-2.0.so.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/SDL2_ttf.pc diff --git a/sdl2_ttf/.signature b/sdl2_ttf/.signature index c98056c51..db97c151d 100644 --- a/sdl2_ttf/.signature +++ b/sdl2_ttf/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35jc/TTnGud4UWhzjddJvYG7UM6ctjb8eEF5KpvNcSj52Koz9AMfxP0EU6z/wPRsC1NyNpUGisfiaGnHCRO+Ow8= -SHA256 (Pkgfile) = 615062301bba15e072169880d80fdc9df524e42cdca4b77e6b25cc5630de92e2 -SHA256 (.footprint) = e7da7672fd90ca695a8ff507dcd7bfc7b1b225a8f78549de64641a87bc473a1c +RWSagIOpLGJF3yJpKRyeNs0NXK9L3EjKyWl9xGMGasePE4gQhQT6E0eGw6Mm9Roz+VhhvflZej8iaggeIQUWYSv3jyyW7zLIFgM= +SHA256 (Pkgfile) = 4738256a5eafe2a48b9e5b7b00fa01c2e03861e26fe322b66480c59c954279fb +SHA256 (.footprint) = d7363868d903b08b17d33ab8d735e17c5d7e0fb3b1a0e1752a22d3014109087c SHA256 (SDL2_ttf-2.20.2.tar.gz) = 9dc71ed93487521b107a2c4a9ca6bf43fb62f6bddd5c26b055e6b91418a22053 diff --git a/sdl2_ttf/Pkgfile b/sdl2_ttf/Pkgfile index b9115b3e5..0025b320f 100644 --- a/sdl2_ttf/Pkgfile +++ b/sdl2_ttf/Pkgfile @@ -1,17 +1,23 @@ # Description: TrueType library for libsdl2. -# URL: https://www.libsdl.org/projects/SDL_ttf/ -# Maintainer: Danny Rawlins, crux at romster dot me +# URL: https://github.com/libsdl-org/SDL_ttf +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: freetype libsdl2 name=sdl2_ttf version=2.20.2 -release=1 +release=2 source=(https://github.com/libsdl-org/SDL_ttf/releases/download/release-$version/SDL...) build() { - cd SDL2_ttf-$version + cmake -S SDL2_ttf-$version -B build -G Ninja \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" - ./configure --prefix=/usr - make - make DESTDIR=$PKG install + ninja -C build -j ${JOBS:-1} + DESTDIR=$PKG ninja -C build install + + # delete installed license.txt + rm -rf $PKG/usr/share }