diff --git a/base/alsa-lib/doinst.sh b/base/alsa-lib/doinst.sh index 318dac0..5caad19 100644 --- a/base/alsa-lib/doinst.sh +++ b/base/alsa-lib/doinst.sh @@ -10,5 +10,5 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config usr/share/alsa/alsa.conf.new +config share/alsa/alsa.conf.new config etc/asound.conf.new diff --git a/extra/sdl2/khronos.patch b/extra/sdl2/khronos.patch deleted file mode 100644 index 71f9692..0000000 --- a/extra/sdl2/khronos.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: sndirsch@suse.com -Date: 2019-10-09 14:00:03+0000 -References: https://bugzilla.opensuse.org/show_bug.cgi?id=1153455 - ---- a/include/SDL_opengl_glext.h -+++ b/include/SDL_opengl_glext.h -@@ -472,8 +472,9 @@ - typedef long GLsizeiptr; - typedef long GLintptr; - #else --typedef ptrdiff_t GLsizeiptr; --typedef ptrdiff_t GLintptr; -+#include -+typedef khronos_ssize_t GLsizeiptr; -+typedef khronos_intptr_t GLintptr; - #endif - #define GL_BUFFER_SIZE 0x8764 - #define GL_BUFFER_USAGE 0x8765 diff --git a/extra/sdl2/sdl2.SMBuild b/extra/sdl2/sdl2.SMBuild index 05830cb..adbd9ae 100755 --- a/extra/sdl2/sdl2.SMBuild +++ b/extra/sdl2/sdl2.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=sdl2 -version=2.0.8 +version=2.26.5 build=1sml homepage="https://www.sdl.org" download="https://www.libsdl.org/release/SDL2-$version.tar.gz" @@ -14,27 +14,30 @@ prepbuilddir() { tar xf $srcdir/SDL2-$version.tar.?z* cd SDL2-$version fixbuilddirpermissions - - applypatch $srcdir/khronos.patch } build() { mkdir -p smbuild && cd smbuild cmake .. \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DSDL_STATIC=OFF \ -DPULSEAUDIO=OFF make make install DESTDIR=$pkg - cp ../COPYING.txt $pkgdocs/ + cp ../LICENSE.txt $pkgdocs/ + + ( + cp -r $pkg/usr/* $pkg/ + rm -r $pkg/usr + ) mkfinalpkg } sha512sums=" -67b9d51ef166f3d1780e64a2265624007ae3b341fbaf278adcee4831dc8afeefde94c02954c09f72895f6dba3007978327911f4284853a410c5be605aa7aa1f6 SDL2-2.0.8.tar.lz -76c93659a122def05f341ba30507b546b201c84823236ca731ac801f092e769574e8f051770a76050a77ac846ed851abab604e0a6d578b382f4792ab47aa60ed khronos.patch +4efa3b68d410928bcba65909e54ff75ff95fb4c0a07f40f7aebbcec633b72026c33fc36f5f0d9ddd1913687860abeebc1373ba835c8dca7f0ad48c5e158d5b2c SDL2-2.26.5.tar.lz " diff --git a/extra/xarchiver/xarchiver.SMBuild b/extra/xarchiver/xarchiver.SMBuild index fb8f61e..3a900e1 100755 --- a/extra/xarchiver/xarchiver.SMBuild +++ b/extra/xarchiver/xarchiver.SMBuild @@ -17,8 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-gtk2 make diff --git a/gtk/openjpeg/openjpeg.SMBuild b/gtk/openjpeg/openjpeg.SMBuild index a0ff254..ec9319d 100755 --- a/gtk/openjpeg/openjpeg.SMBuild +++ b/gtk/openjpeg/openjpeg.SMBuild @@ -21,7 +21,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild cmake .. \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX= \ -DOPENJPEG_INSTALL_LIB_DIR="lib" \ -DBUILD_JPWL:BOOL=ON \ -DBUILD_MJ2:BOOL=ON \ diff --git a/net/poppler-data/poppler-data.SMBuild b/net/poppler-data/poppler-data.SMBuild index 872e428..e8bf9f0 100755 --- a/net/poppler-data/poppler-data.SMBuild +++ b/net/poppler-data/poppler-data.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=poppler-data -version=0.4.8 +version=0.4.12 build=1sml homepage="https://poppler.freedesktop.org/" download="https://poppler.freedesktop.org/poppler-data-$version.tar.gz" @@ -17,13 +17,12 @@ prepbuilddir() { } build() { - - make prefix="" install DESTDIR="$pkg" + make prefix= install DESTDIR="$pkg" cp COPYING* $pkgdocs/ mkfinalpkg } sha512sums=" -b3ae834510c3b10d40862be3adb3279a804d809498258cbc4d09c3f470bcb5e6b05a62db935c9a437e663705f72c40d402352112f2f2c1256240af2aeea1cdd9 poppler-data-0.4.8.tar.lz -" +bd21c2c3236ca7ab4cf7b075bd3cb2b7a8a02394c455e3bc76e665d7f2e11b66efe687584093b05e5e8841bc35315f8511ddf94aad50fae6e37bb96ea356bdc3 poppler-data-0.4.12.tar.lz +" \ No newline at end of file