Upgraded base/acl to 2.3.2
/usr is now no longer a symlink to /. Future commits will have /usr as a proper directory to house stuff. Reset build id to 1sml for some packagees
This commit is contained in:
parent
a258af926e
commit
3963a67474
22 changed files with 53 additions and 143 deletions
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: PktSurf <smlinux@pktsurf.in>
|
||||
app=acl
|
||||
version=2.2.53
|
||||
build=2sml
|
||||
version=2.3.2
|
||||
build=1sml
|
||||
homepage="http://savannah.nongnu.org/projects/acl"
|
||||
download="https://download.savannah.nongnu.org/releases/acl/acl-$version.tar.gz"
|
||||
requires="attr"
|
||||
|
|
@ -18,7 +18,9 @@ prepbuilddir() {
|
|||
|
||||
build() {
|
||||
./configure \
|
||||
--prefix=
|
||||
--prefix=/usr \
|
||||
--bindir=/bin \
|
||||
--disable-nls
|
||||
|
||||
make
|
||||
make install DESTDIR=$pkg
|
||||
|
|
@ -27,5 +29,5 @@ build() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
7b41ad53b4499bf59cb4d37b51db147a9aef8e72855f28044ae73dd8528272a0762e1e4a769919ca72b6cd1cec31161c166f6707e5534b85ed7718c6f57e8895 acl-2.2.53.tar.lz
|
||||
ab9f6fbc150fc48ef1b7f4734aa933bb651abe6a0ae7994f99603a052a7a9a245597db193d221f325282e9a2c8b8993104dca016986584d231a464e09321931a acl-2.3.2.tar.lz
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Maintainer: PktSurf <smlinux@pktsurf.in>
|
||||
app=alsa-lib
|
||||
version=1.2.3.1
|
||||
version=1.2.12
|
||||
build=1sml
|
||||
homepage="http://alsa-project.org"
|
||||
download=""
|
||||
download="http://www.alsa-project.org/files/pub/lib/alsa-lib-$version.tar.bz2"
|
||||
desc="Advanced Linux Sound Architecture provides audio and MIDI functionality for Linux"
|
||||
requires="musl"
|
||||
|
||||
|
|
@ -14,12 +14,12 @@ prepbuilddir() {
|
|||
tar xf $srcdir/$app-$version.tar.?z**
|
||||
cd $app-$version
|
||||
fixbuilddirpermissions
|
||||
applypatch $srcdir/remove-test.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
./configure \
|
||||
--prefix= \
|
||||
--prefix=/usr \
|
||||
--bindir=/bin \
|
||||
--disable-python \
|
||||
--disable-static \
|
||||
--disable-resmgr \
|
||||
|
|
@ -34,21 +34,14 @@ build() {
|
|||
cp COPYING $pkgdocs/
|
||||
|
||||
( cd $pkg
|
||||
mv share/alsa/alsa.conf share/alsa/alsa.conf.new
|
||||
mv usr/share/alsa/alsa.conf usr/share/alsa/alsa.conf.new
|
||||
# create a blank asound.conf.new
|
||||
mkdir -p etc ; touch etc/asound.conf.new
|
||||
)
|
||||
|
||||
if [[ $arch = aarch64 ]]; then
|
||||
# Provide some sample conf files for using USB audio by overwriting the above file
|
||||
cp $srcdir/alsa.conf.rpi.usbaudio $pkg/share/alsa/alsa.conf.new
|
||||
cp $srcdir/asound.conf.rpi $pkg/etc/asound.conf.new
|
||||
fi
|
||||
|
||||
mkfinalpkg
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
2f094b25f77c32d53f6b1499b365fa345e844a57773bcae287920b0a03557c3af38233eb2155515945f3015c80b85fbc54121bd59ccf842a3dbb13c2ea9adbde alsa-lib-1.2.3.1.tar.lz
|
||||
e15318431fe2d5bd1e42ef793f223e3e5995890d7befe6daa3d7456ccf5cb2f51eb79171539cecae13032a9b8a798ea35e04c89b27c7ef9567e2c03fb8db4512 remove-test.patch
|
||||
2733045bdfb33517c27741c8cd2ff2c5901dc2dba66f0bf027b85bf40fa2fc2723123d7e1a7c4989847465cf552be68614a87cb6cc76c2b36e26f17c0ca151a7 alsa-lib-1.2.12.tar.lz
|
||||
"
|
||||
|
|
|
|||
|
|
@ -22,12 +22,12 @@ prepbuilddir() {
|
|||
|
||||
build() {
|
||||
./configure \
|
||||
--prefix=
|
||||
--prefix=/usr
|
||||
|
||||
make
|
||||
|
||||
install -Dm 644 argp.h $pkg/include/argp.h
|
||||
install -Dm 755 libargp.a $pkg/lib/libargp.a
|
||||
install -Dm 644 argp.h $pkg/usr/include/argp.h
|
||||
install -Dm 755 libargp.a $pkg/usr/lib/libargp.a
|
||||
|
||||
head -n 100 ChangeLog > $pkgdocs/CHANGELOG
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ prepbuilddir() {
|
|||
|
||||
build() {
|
||||
./configure \
|
||||
--prefix= \
|
||||
--prefix=/usr \
|
||||
--bindir=/bin \
|
||||
--sysconfdir=/etc/aspell
|
||||
|
||||
make
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ prepbuilddir() {
|
|||
}
|
||||
|
||||
build() {
|
||||
./configure
|
||||
./configure
|
||||
|
||||
make
|
||||
make install DESTDIR=$pkg
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: PktSurf <smlinux@pktsurf.in>
|
||||
app=attr
|
||||
version=2.5.1
|
||||
build=2sml
|
||||
build=1sml
|
||||
homepage="https://savannah.nongnu.org/projects/attr"
|
||||
download="http://download.savannah.nongnu.org/releases/attr/attr-$version.tar.xz"
|
||||
requires="musl"
|
||||
|
|
@ -18,8 +18,10 @@ prepbuilddir() {
|
|||
|
||||
build() {
|
||||
./configure \
|
||||
--prefix= \
|
||||
--disable-static
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--bindir=/bin \
|
||||
--disable-nls
|
||||
|
||||
make
|
||||
make install DESTDIR="$pkg"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ prepbuilddir() {
|
|||
|
||||
build() {
|
||||
./configure \
|
||||
--prefix=
|
||||
--prefix=/usr \
|
||||
--bindir=/bin
|
||||
|
||||
make
|
||||
make install DESTDIR=$pkg
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ prepbuilddir() {
|
|||
|
||||
build() {
|
||||
./configure \
|
||||
--prefix=
|
||||
--prefix=/usr \
|
||||
--bindir=/bin
|
||||
|
||||
make
|
||||
make install DESTDIR=$pkg
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ prepbuilddir() {
|
|||
|
||||
build() {
|
||||
./configure \
|
||||
--prefix=
|
||||
--prefix=/usr
|
||||
|
||||
make
|
||||
make install DESTDIR=$pkg
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: PktSurf <smlinux@pktsurf.in>
|
||||
app=bash
|
||||
version=5.0
|
||||
build=3sml
|
||||
build=1sml
|
||||
homepage="https://www.gnu.org/software/bash/bash.html"
|
||||
download="https://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
|
||||
requires="netbsd-curses"
|
||||
|
|
@ -17,16 +17,14 @@ prepbuilddir() {
|
|||
}
|
||||
|
||||
build() {
|
||||
bash_cv_getenv_redef=no \
|
||||
bash_cv_sys_named_pipes=yes \
|
||||
ac_cv_rl_version=5.0 \
|
||||
LDFLAGS="-static" \
|
||||
./configure \
|
||||
--prefix= \
|
||||
--prefix=/usr \
|
||||
--bindir=/bin \
|
||||
--without-bash-malloc \
|
||||
--disable-rpath \
|
||||
--enable-history
|
||||
--enable-history \
|
||||
--enable-static-link \
|
||||
--disable-nls
|
||||
|
||||
make
|
||||
make install DESTDIR=$pkg
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ build() {
|
|||
./configure.sh -EHNG
|
||||
|
||||
make all
|
||||
make install DESTDIR=$pkg BINDIR="/bin" MAN1DIR="/share/man/man1"
|
||||
make install DESTDIR=$pkg BINDIR="/bin" MAN1DIR="/usr/share/man/man1"
|
||||
|
||||
cp LICENSE.md $pkgdocs
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: PktSurf <smlinux@pktsurf.in>
|
||||
app=brotli
|
||||
version=1.0.7
|
||||
build=2sml
|
||||
build=1sml
|
||||
homepage="https://github.com/google/brotli"
|
||||
download="https://github.com/google/brotli/archive/refs/tags/v$version.tar.gz"
|
||||
requires="musl"
|
||||
|
|
@ -20,7 +20,8 @@ prepbuilddir() {
|
|||
|
||||
build() {
|
||||
./configure \
|
||||
--prefix= \
|
||||
--prefix=/usr \
|
||||
--bindir=/bin \
|
||||
--disable-static
|
||||
|
||||
make
|
||||
|
|
|
|||
|
|
@ -20,7 +20,8 @@ prepbuilddir() {
|
|||
|
||||
build() {
|
||||
./configure \
|
||||
--prefix= \
|
||||
--prefix=/usr \
|
||||
--bindir=/bin \
|
||||
--with-priv-mode=setuid \
|
||||
--disable-man
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: PktSurf <smlinux@pktsurf.in>
|
||||
app=busybox
|
||||
version=1.27.2
|
||||
build=2sml
|
||||
build=1sml
|
||||
homepage="https://www.busybox.net/"
|
||||
download="https://www.busybox.net/downloads/busybox-$version.tar.bz2"
|
||||
requires="musl"
|
||||
|
|
@ -45,9 +45,9 @@ build() {
|
|||
install -Dm 755 $srcdir/udhcpc-script $pkg/etc/udhcpc-script
|
||||
install -Dm 755 $srcdir/dhclient $pkg/bin/dhclient
|
||||
|
||||
mkdir -p $pkg/share/man/man8
|
||||
mkdir -p $pkg/usr/share/man/man8
|
||||
for f in sv runsvchdir chpst runsvdir runit runsv runit ;
|
||||
do cp $srcdir/runit-man/$f.8 $pkg/share/man/man8/
|
||||
do cp $srcdir/runit-man/$f.8 $pkg/usr/share/man/man8/
|
||||
done
|
||||
|
||||
echo "server pool.ntp.org" > $pkg/etc/ntp.conf
|
||||
|
|
|
|||
0
base/busybox/dhclient
Executable file → Normal file
0
base/busybox/dhclient
Executable file → Normal file
0
base/busybox/udhcpc-script
Executable file → Normal file
0
base/busybox/udhcpc-script
Executable file → Normal file
|
|
@ -25,8 +25,8 @@ build() {
|
|||
make $MAKEFLAGS
|
||||
|
||||
# Copy headers, the shared library and the binaries
|
||||
install -Dm 644 bzlib.h $pkg/include/bzlib.h
|
||||
install -Dm 755 libbz2.so.$version $pkg/lib/libbz2.so.$version
|
||||
install -Dm 644 bzlib.h $pkg/usr/include/bzlib.h
|
||||
install -Dm 755 libbz2.so.$version $pkg/usr/lib/libbz2.so.$version
|
||||
|
||||
# Copy binaries
|
||||
install -Dm 755 bzdiff $pkg/bin/bzdiff
|
||||
|
|
@ -36,15 +36,15 @@ build() {
|
|||
install -Dm 755 bzip2recover $pkg/bin/bzip2recover
|
||||
|
||||
# And man pages
|
||||
mkdir -p $pkg/share/man/man1
|
||||
mkdir -p $pkg/usr/share/man/man1
|
||||
for manpage in bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 ; do
|
||||
cp $manpage $pkg/share/man/man1/
|
||||
cp $manpage $pkg/usr/share/man/man1/
|
||||
done
|
||||
|
||||
cp LICEN?E $pkgdocs/
|
||||
|
||||
(
|
||||
cd $pkg/lib
|
||||
cd $pkg/usr/lib
|
||||
ln -sf libbz2.so.$version libbz2.so.1.0
|
||||
ln -sf libbz2.so.$version libbz2.so
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index d228de0..63818c5 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -392,7 +392,8 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
|
||||
endif
|
||||
|
||||
# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
|
||||
-if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
|
||||
+with_use_elf_tls = get_option('use-elf-tls')
|
||||
+if with_use_elf_tls and not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
|
||||
pre_args += '-DUSE_ELF_TLS'
|
||||
endif
|
||||
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index ab43150..435a6e9 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -387,3 +387,9 @@ option(
|
||||
value : 'auto',
|
||||
description : 'Use ZSTD instead of ZLIB in some cases.'
|
||||
)
|
||||
+option(
|
||||
+ 'use-elf-tls',
|
||||
+ type : 'boolean',
|
||||
+ value : false,
|
||||
+ description : 'Build support for initial-exec TLS model'
|
||||
+)
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
diff -ru mesa-18.1.7.orig/src/util/disk_cache.c mesa-18.1.7/src/util/disk_cache.c
|
||||
--- mesa-18.1.7.orig/src/util/disk_cache.c 2018-08-24 19:25:19.000000000 +0300
|
||||
+++ mesa-18.1.7/src/util/disk_cache.c 2018-12-14 13:59:15.433631846 +0200
|
||||
@@ -721,8 +721,11 @@
|
||||
/* From the zlib docs:
|
||||
* "If the memory is available, buffers sizes on the order of 128K or 256K
|
||||
* bytes should be used."
|
||||
+ *
|
||||
+ * But that is performance optimization for large files. To keep stack usage
|
||||
+ * in sensible amount (wrt. musl default stack) we use smaller stack on Alpine.
|
||||
*/
|
||||
-#define BUFSIZE 256 * 1024
|
||||
+#define BUFSIZE 4 * 1024
|
||||
|
||||
/**
|
||||
* Compresses cache entry in memory and writes it to disk. Returns the size
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From b33c8b56abcc4837f96f7f106b108681858482e0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||
Date: Tue, 24 Apr 2018 09:46:41 +0200
|
||||
Subject: [PATCH] gallium: Disable rgb10 configs by default
|
||||
|
||||
Applications tend to not handle rgb10 configs very well, so lets
|
||||
disable it for now.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1560481
|
||||
---
|
||||
src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
|
||||
index 21dc599dc2..23f9194149 100644
|
||||
--- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
|
||||
+++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
|
||||
@@ -39,6 +39,6 @@ DRI_CONF_SECTION_MISCELLANEOUS
|
||||
DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER("false")
|
||||
DRI_CONF_GLSL_ZERO_INIT("false")
|
||||
DRI_CONF_VS_POSITION_ALWAYS_INVARIANT("false")
|
||||
- DRI_CONF_ALLOW_RGB10_CONFIGS("true")
|
||||
+ DRI_CONF_ALLOW_RGB10_CONFIGS("false")
|
||||
DRI_CONF_ALLOW_FP16_CONFIGS("false")
|
||||
DRI_CONF_SECTION_END
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: PktSurf <smlinux@pktsurf.in>
|
||||
app=mesa
|
||||
version=22.3.6
|
||||
build=2sml
|
||||
build=1sml
|
||||
homepage="https://www.mesa3d.org/"
|
||||
download="https://archive.mesa3d.org/mesa-$version.tar.xz"
|
||||
desc="An open-source implementation of the OpenGL specification"
|
||||
|
|
@ -18,12 +18,10 @@ prepbuilddir() {
|
|||
|
||||
build() {
|
||||
if [[ $arch = aarch64 ]]; then
|
||||
dridrivers=""
|
||||
galliumdrivers="swrast,v3d,vc4,kmsro"
|
||||
|
||||
elif [[ $arch = x86_64 ]]; then
|
||||
dridrivers="i915,i965,nouveau,r100,r200,swrast"
|
||||
galliumdrivers="nouveau,radeonsi,r300,r600"
|
||||
galliumdrivers="nouveau,radeonsi,swrast,r300,i915,iris,zink"
|
||||
fi
|
||||
|
||||
mkdir -p smbuild && cd smbuild
|
||||
|
|
@ -32,11 +30,13 @@ build() {
|
|||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
-Dbuildtype=release \
|
||||
-Ddri-drivers="$dridrivers" \
|
||||
-Dgallium-va=enabled \
|
||||
-Dgallium-vdpau=enabled \
|
||||
-Dgallium-drivers="$galliumdrivers" \
|
||||
-Dvulkan-drivers=amd,intel,swrast \
|
||||
-Dplatforms="x11,wayland" \
|
||||
-Dgallium-nine=false \
|
||||
-Degl=true \
|
||||
-Degl=enabled \
|
||||
-Dgles1=disabled \
|
||||
-Dgles2=enabled \
|
||||
-Dglx=dri \
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
--- a/src/util/rand_xor.c
|
||||
+++ b/src/util/rand_xor.c
|
||||
@@ -24,6 +24,8 @@
|
||||
|
||||
#if defined(__linux__)
|
||||
#include <sys/file.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#else
|
||||
--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
|
||||
+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
|
||||
@@ -34,7 +34,7 @@
|
||||
#ifndef VMW_SCREEN_H_
|
||||
#define VMW_SCREEN_H_
|
||||
|
||||
-
|
||||
+#include <sys/stat.h>
|
||||
#include "pipe/p_compiler.h"
|
||||
#include "pipe/p_state.h"
|
||||
Loading…
Reference in a new issue