commit 9488c49b746c4d9eb2dd311a6be69ae09c1e20c3 Author: Danny Rawlins <contact@romster.me> Date: Sun Dec 12 18:50:08 2021 +1100 [notify] libsdl2-32: fix build options diff --git a/libsdl2-32/.footprint b/libsdl2-32/.footprint index e197d69..4429dab 100644 --- a/libsdl2-32/.footprint +++ b/libsdl2-32/.footprint @@ -1,15 +1,16 @@ drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/cmake/ -drwxr-xr-x root/root usr/lib/cmake/SDL2/ --rw-r--r-- root/root usr/lib/cmake/SDL2/SDL2Config.cmake --rw-r--r-- root/root usr/lib/cmake/SDL2/SDL2ConfigVersion.cmake --rw-r--r-- root/root usr/lib/cmake/SDL2/SDL2Targets.cmake --rw-r--r-- root/root usr/lib/cmake/SDL2/SDL2Targets-release.cmake --rwxr-xr-x root/root usr/lib/libSDL2-2.0.so.0.18.0 -lrwxrwxrwx root/root usr/lib/libSDL2-2.0.so.0 -> libSDL2-2.0.so.0.18.0 -lrwxrwxrwx root/root usr/lib/libSDL2-2.0.so -> libSDL2-2.0.so.0 --rw-r--r-- root/root usr/lib/libSDL2main.a -lrwxrwxrwx root/root usr/lib/libSDL2.so -> libSDL2-2.0.so -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/sdl2.pc +drwxr-xr-x root/root usr/lib32/ +drwxr-xr-x root/root usr/lib32/cmake/ +drwxr-xr-x root/root usr/lib32/cmake/SDL2/ +-rw-r--r-- root/root usr/lib32/cmake/SDL2/SDL2Config.cmake +-rw-r--r-- root/root usr/lib32/cmake/SDL2/SDL2ConfigVersion.cmake +-rw-r--r-- root/root usr/lib32/cmake/SDL2/SDL2Targets-release.cmake +-rw-r--r-- root/root usr/lib32/cmake/SDL2/SDL2Targets.cmake +lrwxrwxrwx root/root usr/lib32/libSDL2-2.0.so -> libSDL2-2.0.so.0 +lrwxrwxrwx root/root usr/lib32/libSDL2-2.0.so.0 -> libSDL2-2.0.so.0.18.0 +-rwxr-xr-x root/root usr/lib32/libSDL2-2.0.so.0.18.0 +-rw-r--r-- root/root usr/lib32/libSDL2.a +lrwxrwxrwx root/root usr/lib32/libSDL2.so -> libSDL2-2.0.so +-rw-r--r-- root/root usr/lib32/libSDL2main.a +drwxr-xr-x root/root usr/lib32/pkgconfig/ +-rw-r--r-- root/root usr/lib32/pkgconfig/sdl2.pc diff --git a/libsdl2-32/.signature b/libsdl2-32/.signature index 7997003..8b15d15 100644 --- a/libsdl2-32/.signature +++ b/libsdl2-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXRgqGJBTGrGZ+U8s84q7yvta+lcu+bDrgUw7R/NG3KsPHhuS/u6HMPrZ59fY5KHuu6I1C8W29OlKZDNYEY8/MAY= -SHA256 (Pkgfile) = a98fb637a99734fdc651af18e1b3ec432c65c0c1d6736c5c0f1b7b23571e9dc0 -SHA256 (.footprint) = 80108334d520e5783ad8dc8deb3acc5f2a6718ad7e4f411d68afb59221a137cc +RWSwxGo/zH7eXQBbaO54DDeyRbQ5Z4JBtf7/Da+09ycUVJwEKhh+l3UL3GtGa46V/+io+GDG4yOenhz3opNJfNlR6FTVQiNBXQc= +SHA256 (Pkgfile) = bb2d799c5eda8de2b144da2ecc19b042dd1720996a92631f2440937d0c7b7bcb +SHA256 (.footprint) = 9636bae45d607b4e3543ec5cbf99d6712a1dfdf6a7136055660a3ef406716479 SHA256 (SDL2-2.0.18.tar.gz) = 94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c diff --git a/libsdl2-32/Pkgfile b/libsdl2-32/Pkgfile index dc7ed6e..9a959de 100644 --- a/libsdl2-32/Pkgfile +++ b/libsdl2-32/Pkgfile @@ -2,39 +2,30 @@ # URL: https://www.libsdl.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu # Depends on: alsa-lib-32 libsdl2 mesa-32 -# Optional: ninja pipewire-32 pulseaudio-32 wayland-protocols-32 +# Optional: alsa-lib ibus-32 jack ninja pipewire pulseaudio wayland-protocols name=libsdl2-32 version=2.0.18 -release=1 +release=2 source=(https://www.libsdl.org/release/SDL2-$version.tar.gz) build() { - prt-get isinst alsa-lib-32 && PKGMK_SDL2+=' -D ALSA=ON' prt-get isinst ninja && PKGMK_SDL2+=' -G Ninja' - prt-get isinst jack && PKGMK_SDL2+=' -D JACK_SHARED=OFF' - #prt-get isinst jack-32 && PKGMK_SDL2+=' -D JACK_SHARED=ON' - prt-get isinst pipewire-32 && PKGMK_SDL2+=' -D PIPEWIRE_SHARED=ON' - prt-get isinst pulseaudio-32 && PKGMK_SDL2+=' -D PULSEAUDIO_SHARED=ON' - prt-get isinst wayland-protocols-32 && PKGMK_SDL2+=' -D VIDEO_WAYLAND=ON' - - sed -i -e 's|lib/cmake|lib32/cmake|' \ - -e '/pkg_search_module.*ibus-1.0/d' SDL2-$version/CMakeLists.txt - - prt-get isinst ccache && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" - - ## Target "SDL2" links to item " -m32" which has leading or trailing - ## whitespace. This is now an error according to policy CMP0004. - LDFLAGS='-m32' + prt-get isinst alsa-lib-32 && PKGMK_SDL2+=' -D SDL_ALSA_SHARED=ON' + prt-get isinst ibus-32 && PKGMK_SDL2+=' -D SDL_USE_IME=ON' + prt-get isinst jack-32 && PKGMK_SDL2+=' -D SDL_JACK_SHARED=ON' + prt-get isinst pipewire-32 && PKGMK_SDL2+=' -D SDL_PIPEWIRE_SHARED=ON' + prt-get isinst pulseaudio-32 && PKGMK_SDL2+=' -D SDL_PULSEAUDIO_SHARED=ON' + prt-get isinst wayland-protocols-32 && PKGMK_SDL2+=' -D SDL_WAYLAND_SHARED=ON' cmake -S SDL2-$version -B build $PKGMK_SDL2 \ -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_INSTALL_LIBDIR=lib \ - -D LIB_SUFFIX=32 \ + -D CMAKE_INSTALL_LIBDIR=lib32 \ -D CMAKE_BUILD_TYPE=Release \ - -D CLOCK_GETTIME=ON \ - -D RPATH=OFF \ - -D SDL_STATIC=OFF \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ + -D SDL_CLOCK_GETTIME=ON \ + -D SDL_RPATH=OFF \ -D SDL_DLOPEN=ON \ -Wno-dev cmake --build build