Upgraded base/gpgme to 1.23.2

Enabled linking base/libpcap against libusb and libnl
Added additional build options in base/libvpx and base/xkeyboard-config
Disabled native language support in base/neon
Removed vintage code from base/openssl,pkgtools, fixed code in base/pkgtools/installpkg
Added spirv-headers, glslang-vulkan-sdk and libva to xorg
Upgraded xorg/libpciaccess to 0.18.1
Added code to move stuff in /usr and elf binaries in /bin in several build files in base section
This commit is contained in:
PktSurf 2024-10-18 22:38:22 +05:30
parent 8581e374ef
commit e94a3391ea
24 changed files with 196 additions and 66 deletions

View file

@ -20,6 +20,8 @@ build() {
cp COPYING.txt LICENSE.txt $pkgdocs/
mv $pkg/usr/bin $pkg/
mkfinalpkg
}

View file

@ -1,6 +1,6 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=gpgme
version=1.20.0
version=1.23.2
build=1sml
homepage="https://gnupg.org/software/gpgme/index.html"
download="https://gnupg.org/ftp/gcrypt/gpgme/gpgme-$version.tar.bz2"
@ -14,15 +14,18 @@ prepbuilddir() {
tar xf $srcdir/$app-$version.tar.?z*
cd $app-$version
fixbuilddirpermissions
applypatch $srcdir/lfs64.patch
}
build() {
# TODO: disable linking against qt5
./configure \
--prefix="" \
--prefix=/usr \
--bindir=/bin \
--disable-static \
--disable-gpg-test \
--enable-languages="cl cpp"
--enable-languages="cl cpp" \
--disable-dependency-tracking
make
make install DESTDIR=$pkg
@ -33,5 +36,5 @@ build() {
}
sha512sums="
82dfd272edd4adab09e8428bf809c13eeb50a4a7d2397c41d29ffa3832c4f46054ad75eb053fbcc876ebbf78bb8bcf71d95bc9dad68f4b326492ea513dd5b606 gpgme-1.20.0.tar.bz2
"
109aceb4d753f6b1367a3fa503280d1f2de61b0f4719930b82e1996fa58ffa641798524de2a9124c1e25cb8e8b3dc5611062fe2872573c979b6fd94d92e721f1 gpgme-1.23.2.tar.lz
"

15
base/gpgme/lfs64.patch Normal file
View file

@ -0,0 +1,15 @@
diff --git a/src/posix-io.c b/src/posix-io.c
index a422d8f..25f694e 100644
--- a/src/posix-io.c
+++ b/src/posix-io.c
@@ -74,8 +74,8 @@
* define it ourselves. */
struct linux_dirent64
{
- ino64_t d_ino;
- off64_t d_off;
+ ino_t d_ino;
+ off_t d_off;
unsigned short d_reclen;
unsigned char d_type;
char d_name[];

View file

@ -5,7 +5,7 @@ build=1sml
homepage="http://www.tcpdump.org"
download="https://www.tcpdump.org/release/libpcap-$version.tar.gz"
desc="packet capture library"
requires="musl"
requires="libusb libnl"
prepbuilddir() {
mkandenterbuilddir
@ -17,11 +17,14 @@ prepbuilddir() {
}
build() {
CFLAGS+=" -D_BSD_SOURCE -DIPPROTO_HOPOPTS=0 -include limits.h" \
CFLAGS+=" -DIPPROTO_HOPOPTS=0 -include limits.h" \
ac_cv_type_u_int64_t=yes \
./configure \
--prefix= \
--prefix=/usr \
--bindir=/bin \
--enable-shared \
--with-libnl \
--enable-usb \
--disable-dbus \
--disable-bluetooth

View file

@ -19,12 +19,11 @@ prepbuilddir() {
}
build() {
# configure creates /usr in staging if prefix is unset
# and fails if '/' is passed as prefix
./configure \
--prefix="//" \
--prefix=/usr \
--enable-shared \
--disable-static
--disable-static \
--disable-install-bins
make
make install DESTDIR=$pkg
@ -36,4 +35,4 @@ build() {
sha512sums="
ee9993a0db857f6bf8279105cd78e0f635855b6b4f1a080ccb15a78db5ad4075e30679e9c6714706e3830e644fc2503d56d4d34d1367403fb4f818e009f6f5b8 libvpx-1.10.0.tar.lz
"
"

View file

@ -18,10 +18,12 @@ prepbuilddir() {
build() {
./configure \
--prefix= \
--prefix=/usr \
--bindir=/bin \
--enable-static=no \
--enable-shared=yes \
--with-ssl=openssl
--with-ssl=openssl \
--disable-nls
make
make install DESTDIR=$pkg

View file

@ -1,7 +1,7 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=openssl
version=1.1.1t
build=2sml
build=1sml
homepage="https://www.openssl.org/"
download="https://www.openssl.org/source/openssl-$version.tar.gz"
desc="Commercial-grade, full-featured crypto library from OpenSSL Project that implements TLS 1.x protocol"
@ -17,22 +17,22 @@ prepbuilddir() {
}
build() {
if [[ $arch = aarch64 ]]; then
cpuflag=linux-aarch64
elif [[ $arch = x86_64 ]]; then
cpuflag=linux-x86_64
fi
cpuflag=linux-x86_64
./Configure $cpuflag \
--prefix=/ \
--openssldir=/etc/ssl \
shared enable-md2 no-weak-ssl-ciphers
--prefix=/usr \
--openssldir=/etc/ssl \
shared enable-md2 no-weak-ssl-ciphers
make
make install LIBDIR=lib DESTDIR=$pkg
make install_sw install_man_docs DESTDIR=$pkg
cp LICENSE $pkgdocs/
mkdir -p $pkg/bin
mv $pkg/usr/bin/* $pkg/bin/
rmdir $pkg/usr/bin
mkfinalpkg
}

View file

@ -6,7 +6,6 @@ homepage="https://slackware.uk/slackware/slackware-14.2/source/a/pkgtools/"
download="https://slackware.uk/slackware/slackware-14.2/source/a/pkgtools/"
desc="The Slackware package maintenance system, modified for SMLinux"
requires="tar grep gawk sed bash util-linux coreutils"
skipchecksum=1
prepbuilddir() {
ARCH=noarch
@ -16,24 +15,12 @@ prepbuilddir() {
build() {
# Install Slackware script manpages:
( cd $srcdir/manpages
mkdir -p $pkg/share/man/man8
for page in explodepkg.8 installpkg.8 makepkg.8 upgradepkg.8 pkgtool.8 \
removepkg.8 ; do
cat $page | gzip -9c > $pkg/share/man/man8/$page.gz
done
)
mkdir -p $pkg/bin $pkg/usr/share/man/man8
cp $srcdir/manpages/* $pkg/usr/share/man/man8/
cp $srcdir/scripts/* $pkg/bin/
# Install Slackware scripts:
( cd $srcdir/scripts
# Install the core Slackware package tools:
mkdir -p $pkg/bin
for file in explodepkg installpkg makepkg pkgtool removepkg upgradepkg ; do
cp -a $srcdir/scripts/$file $pkg/bin
done
chown root:root $pkg/bin/*
chmod 755 $pkg/bin/*
)
chown root:root $pkg/bin/*
chmod 755 $pkg/bin/*
mkfinalpkg
}

0
base/pkgtools/scripts/explodepkg Executable file → Normal file
View file

6
base/pkgtools/scripts/installpkg Executable file → Normal file
View file

@ -140,9 +140,9 @@ for package in $* ; do
if [ "$DESCRIPTION" = "" ]; then
mkdir -p $TMP/scan$$
( cd $TMP/scan$$ ; $packagecompression -dc | $TAR xf - install ) < $package 2> /dev/null
( cd $TMP/scan$$ ; $packagecompression -dc | $TAR xf - share ) < $package 2> /dev/null
if [ "$( find $TMP/scan$$/share -name "$packagebase.SMBuild" | wc -l)" == "1" ] ; then
source "$( find $TMP/scan$$/share -name "$packagebase.SMBuild" )"
( cd $TMP/scan$$ ; $packagecompression -dc | $TAR xf - usr/share ) < $package 2> /dev/null
if [ "$( find $TMP/scan$$/usr/share -name "$packagebase.SMBuild" | wc -l)" == "1" ] ; then
source "$( find $TMP/scan$$/usr/share -name "$packagebase.SMBuild" )"
# The build file contains the $DESC variable. We use that as our description
DESCRIPTION="$(echo $desc)"
# Set a custom variable once we source the application build file

0
base/pkgtools/scripts/makepkg Executable file → Normal file
View file

0
base/pkgtools/scripts/pkgtool Executable file → Normal file
View file

0
base/pkgtools/scripts/removepkg Executable file → Normal file
View file

0
base/pkgtools/scripts/upgradepkg Executable file → Normal file
View file

View file

@ -21,9 +21,11 @@ build() {
python3 setup.py build
python3 setup.py install --root=$pkg
mkdir -p $pkg/share/man
mv $pkg/usr/man/man1/* $pkg/share/man/
rm -r $pkg/usr/man
mkdir $pkg/bin
mv $pkg/usr/bin/* $pkg/bin/
rmdir $pkg/usr/bin
mv $pkg/usr/man $pkg/usr/share/
cp LICENSE.txt $pkgdocs/

View file

@ -1,7 +1,7 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=speexdsp
version=1.2.0
build=2sml
build=1sml
homepage="http://www.speex.org/"
desc="Patent-free open-source DSP library"
requires="musl"
@ -17,7 +17,7 @@ prepbuilddir() {
build() {
./configure \
--prefix= \
--prefix=/usr \
--disable-static
make

View file

@ -43,6 +43,9 @@ libxaw
libxaw3d
libxaw3dxft
libxscrnsaver
spirv-headers
glslang-vulkan-sdk
libva
mesa
glew
glu

View file

@ -5,7 +5,7 @@ build=1sml
homepage="https://www.freetype.org/"
download="https://downloads.sourceforge.net/freetype/freetype-$version.tar.bz2"
desc="Font rasterization library"
requires="bzip2 zlib libpng "
requires="bzip2 zlib libpng"
prepbuilddir() {
mkandenterbuilddir
@ -18,12 +18,16 @@ prepbuilddir() {
build() {
./configure \
--prefix= \
--prefix=/usr \
--bindir=/bin \
--disable-static \
--with-harfbuzz=no
make
make install DESTDIR=$pkg
# For some reason, freetype-config is not installed, which breaks builds like dia
install -Dm 755 builds/unix/freetype-config $pkg/bin/freetype-config
cp docs/GPLv2.TXT $pkgdocs/
@ -32,4 +36,4 @@ build() {
sha512sums="
c8056a7597fa91a4fbbf8231aa92d8c92cdfc443ddffe5f7925ceb4339c401642f34ddb94c0c3bc8e8e64a7948dc11c07b3d0f1d969e94e504f7eec3d439e794 freetype-2.13.0.tar.lz
"
"

View file

@ -0,0 +1,39 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=glslang-vulkan-sdk
version=1.3.268
build=1sml
homepage="https://xorg.freedesktop.org/"
download="https://xorg.freedesktop.org/releases/individual/lib/libICE-$version.tar.bz2"
desc="OpenGL and OpenGL ES shader front end and validato"
requires="xorgproto xorg-macros xtrans"
prepbuilddir() {
mkandenterbuilddir
rm -rf $app-$version
tar xf $srcdir/$app-$version.tar.?z*
cd $app-$version
fixbuilddirpermissions
}
build() {
mkdir -p smbuild && cd smbuild
cmake .. \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_BINDIR=/bin \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=On \
-DENABLE_OPT=0
make
make install DESTDIR=$pkg
cp ../LICENSE* $pkgdocs/
mkfinalpkg
}
sha512sums="
623fb8070a54be2068f9ea1ee80c1fc7ba0be314213b5f691a482241c76df75baa26d40f9c2ca2f8de3d247965b15203d82cbd69d8e888e18dfe4533c2a79abb glslang-vulkan-sdk-1.3.268.tar.lz
"

View file

@ -1,6 +1,6 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=libpciaccess
version=0.16
version=0.18.1
build=1sml
homepage="https://xorg.freedesktop.org/"
download="https://xorg.freedesktop.org/releases/individual/lib/libpciaccess-$version.tar.gz"
@ -17,16 +17,14 @@ prepbuilddir() {
}
build() {
./configure \
--prefix= \
--disable-static \
--disable-selective-werror \
--disable-strict-compilation
mkdir -p smbuild && cd smbuild
meson .. \
--prefix=/usr
make
make install DESTDIR=$pkg
ninja
DESTDIR=$pkg ninja install
cp COPYING $pkgdocs/
cp ../COPYING $pkgdocs/
mkfinalpkg
}

36
xorg/libva/libva.SMBuild Executable file
View file

@ -0,0 +1,36 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
# Generated by mksm SMLinux build file generator version 0.101
app=libva
version=2.20.0
build=1sml
homepage="https://github.com/intel/libva"
download="https://github.com/intel/libva/releases/download/$version/libva-$version.tar.bz2"
desc="Video acceleration API for Linux"
requires="libdrm libx11 libxext libxfixes"
prepbuilddir() {
mkandenterbuilddir
rm -rf $app-$version
tar xf $srcdir/$app-$version.tar.?z*
cd $app-$version
fixbuilddirpermissions
}
build() {
mkdir smbuild && cd smbuild
meson .. \
--prefix=/usr
ninja
DESTDIR="$pkg" ninja install
cp ../COPYING $pkgdocs/
mkfinalpkg
}
sha512sums="
fe4613f725e280261ef9d6c26dd8456d2e5044ec2f6347e2afd21ff281c45e5f79a797ae9ad7fa7b6c8dd072756797b0dc9bd752a67b7ba7fa24df43781bcfcf libva-2.20.0.tar.lz
"

View file

@ -0,0 +1,36 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=spirv-headers
version=1.2
build=1sml
hash="e867c06631767a2d96424cbec530f9ee5e78180f"
homepage="https://xorg.freedesktop.org/"
download="https://xorg.freedesktop.org/releases/individual/lib/libICE-$version.tar.bz2"
desc="X11 Inter-Client Exchange library"
requires="xorgproto xorg-macros xtrans"
prepbuilddir() {
mkandenterbuilddir
rm -rf $app-$version
tar xf $srcdir/$app-$version.tar.?z*
cd $app-$version
fixbuilddirpermissions
}
build() {
mkdir -p smbuild && cd smbuild
cmake .. \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr
make
make install DESTDIR=$pkg
cp ../LICENSE* $pkgdocs/
mkfinalpkg
}
sha512sums="
bd743dd22e698ece6897acbe6b55511ec1403102e418a52a5663a9d9197989780d4f16d7694764645d444d7252c6ad9e46bae6fa283222a1f926e186ad993d5a spirv-headers-1.2.tar.lz
"

View file

@ -19,7 +19,8 @@ prepbuilddir() {
build() {
mkdir -p smbuild && cd smbuild
meson .. \
--prefix=/
--prefix=/usr \
-Dxorg-rules-symlinks=true
ninja
DESTDIR="$pkg" ninja install

View file

@ -1,7 +1,7 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=xorg-server
version=1.20.14
build=2sml
build=1sml
homepage="https://www.x.org/wiki/"
download="https://www.x.org/releases/individual/xserver/xorg-server-$version.tar.gz"
requires="eudev libgcrypt xtrans pixman libpciaccess libxv libxkbfile libxfont2 libxtst libxrender libxaw mesa "
@ -21,7 +21,7 @@ prepbuilddir() {
build() {
./configure \
--prefix= \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \