diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3a6e268 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/packages +/sources +*.tar.xz diff --git a/bootstrap.sh b/bootstrap.sh index 1ec8cd7..42a3865 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -31,15 +31,15 @@ PKGMK_PACKAGE_DIR=/tmp/lfs-pkg rm -rf /tmp/pkgutils-5.40.10 tar -xf $sourcedir/pkgutils-5.40.10.tar.xz -C /tmp sed -i -e 's/ --static//' -e 's/ -static//' /tmp/pkgutils-5.40.10/Makefile - make -C /tmp/pkgutils-5.40.10 - make -C /tmp/pkgutils-5.40.10 BINDIR=$TOOLS/bin MANDIR=$TOOLS/man ETCDIR=$TOOLS/etc install + make -j$(nproc) -C /tmp/pkgutils-5.40.10 + make -j$(nproc) -C /tmp/pkgutils-5.40.10 BINDIR=$TOOLS/bin MANDIR=$TOOLS/man ETCDIR=$TOOLS/etc install rm -rf /tmp/pkgutils-5.40.10 fi for i in $toolchainpkg; do [ -f $TOOLS/$i ] && continue export tcpkg="$i" - cd core/${i%-pass*} + cd ports/core/${i%-pass*} mkdir -p /tmp/lfs-pkg pkgmk -d -is -if -cf /tmp/bootstrap.conf rm -rf /tmp/lfs-pkg @@ -83,9 +83,8 @@ _buildbase() { echo "base need to build as root" exit 1 fi - export PATH=$TOOLS/bin:$PATH if [ ! -f $LFS/var/lib/pkg/db ]; then - mkdir -pv $LFS/bin $LFS/usr/lib $LFS/usr/bin $LFS/etc $LFS/dev || true + mkdir -pv $LFS/bin $LFS/usr/lib $LFS/usr/bin $LFS/etc $LFS/dev for i in bash cat chmod dd echo ln mkdir pwd rm stty; do ln -svf $TOOLS/bin/$i $LFS/bin done @@ -97,15 +96,11 @@ _buildbase() { ln -svf bash $LFS/bin/sh ln -svf /proc/self/mounts $LFS/etc/mtab - mknod -m 600 $LFS/dev/console c 5 1 || true - mknod -m 666 $LFS/dev/null c 1 3 || true - - #mkdir -p $LFS/lib - #ln -s lib $LFS/lib64 - #ln -svf $TOOLS/lib/ld-linux-x86-64.so.2 $LFS/lib + #mknod -m 600 $LFS/dev/console c 5 1 || true + #mknod -m 666 $LFS/dev/null c 1 3 || true - cat core/aaa_filesystem/passwd > $LFS/etc/passwd - cat core/aaa_filesystem/group > $LFS/etc/group + cat ports/core/aaa_filesystem/passwd > $LFS/etc/passwd + cat ports/core/aaa_filesystem/group > $LFS/etc/group # pkgutils mkdir -p $LFS/var/lib/pkg @@ -120,19 +115,14 @@ _buildbase() { # core ports rm -rf $LFS/usr/ports/core mkdir -p $LFS/usr/ports/core - cp -r core/* $LFS/usr/ports/core + cp -r ports/core/* $LFS/usr/ports/core - # xpkg - #echo 'repodir /usr/ports/core' > $LFS/etc/xpkg.conf - #cp core/xpkg/xpkg $TOOLS/bin - #chmod +x $TOOLS/bin/xpkg cp files/pkgin $TOOLS/bin/pkgin chmod +x $TOOLS/bin/pkgin # pkgmk mkdir -p $LFS/var/lib/pkgmk - cp core/pkgutils/extension $LFS/var/lib/pkgmk - cp core/pkgutils/pkgadd.conf $LFS/etc + cp ports/core/pkgutils/extension $LFS/var/lib/pkgmk echo ' export CFLAGS="-O2 -march=x86-64 -pipe" export CXXFLAGS="${CFLAGS}" @@ -156,15 +146,18 @@ PKGMK_WORK_DIR="/tmp/pkgmk-$name" #_xpkg_opt="add" fi + # host PATH + export PATH=$TOOLS/bin:$PATH + mountfs for i in $basepkg; do if [ "$1" != rebuild ]; then pkginfo -i -r $LFS | awk '{print $1}' | grep -qx $i && continue unset _force case $i in - aaa_filesystem|gcc|bash|dash|perl|coreutils|pkgutils|xpkg) _force=-f;; + aaa_filesystem|gcc|bash|dash|perl|coreutils|pkgutils) _force=-f;; esac - chroot $LFS env -i PATH=$LFSPATH pkgin $pkgmkopt -d $i -is -if -cf /tmp/pkgmk.conf || { umountfs; exit 1; } + chroot $LFS env -i PATH=$LFSPATH pkgin $pkgmkopt -d $i -is -if -im -cf /tmp/pkgmk.conf || { umountfs; exit 1; } pkgadd -r $LFS $_force $pkgaddopt $(ls -1 $packagedir/$i#* | tail -n1) || exit 1 case $i in glibc) cat << EOF > $LFS/tmp/glibc-postinstall @@ -190,7 +183,7 @@ EOF ;; esac else - chroot $LFS env -i PATH=$LFSPATH prt-get update -fr $i || { umountfs; exit 1; } + chroot $LFS env -i PATH=$LFSPATH prt-get update -fr -if $i || { umountfs; exit 1; } fi done umountfs @@ -246,7 +239,7 @@ basepkg="aaa_filesystem linux-headers man-pages glibc tzdata zlib bzip2 xz file libtool gdbm gperf expat inetutils perl perl-xml-parser intltool autoconf automake openssl kmod gettext elfutils libffi sqlite python coreutils check diffutils gawk findutils groff less gzip zstd iptables libtirpc iproute2 kbd libpipeline make patch man-db tar texinfo vim procps-ng util-linux e2fsprogs sysklogd eudev which - libarchive ca-certificates curl pkgutils prt-get" + libarchive ca-certificates curl pkgutils prt-get httpup linux-pam ports prt-utils runit runit-rc signify" sourcedir="$PWD/sources" packagedir="$PWD/packages" diff --git a/files/pkgin b/files/pkgin index e158a3b..eaa4db0 100644 --- a/files/pkgin +++ b/files/pkgin @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e # # - a simple wrapper script for pkgmk # - will build, install, upgrade and other operation without 'cd' into each port directory @@ -9,38 +9,37 @@ # pkgin [port names] [pkgmk options] # -trap "exit 1" SIGHUP SIGINT SIGQUIT SIGTERM +trap "exit 1" 1 2 3 15 -REPO="/usr/ports/core /usr/ports/extra /usr/ports/xorg /usr/ports/multilib" +REPO="/usr/ports/core /usr/ports/extra /usr/ports/multilib" while [ $1 ]; do case $1 in - -cf) PKGMK_CMD+=($1 $2); shift;; - -*) PKGMK_CMD+=($1);; - *) PKG+=($1);; + -cf) PKGMK_CMD="$PKGMK_CMD $1 $2"; shift;; + -*) PKGMK_CMD="$PKGMK_CMD $1";; + *) PKG="$PKG $1";; esac shift done -if [[ "${PKG[@]}" = "" ]]; then +if [ ! "$PKG" ]; then echo "Please provide port name to install." exit 1 fi -for p in ${PKG[@]}; do - if pkginfo -i | awk '{print $1}' | grep -xq $p; then - echo "Package '$p' is installed." - continue - fi +for p in $PKG; do PKGFOUND=no for r in $REPO; do if [ -f $r/$p/Pkgfile ]; then PKGFOUND=yes - cd $r/$p &>/dev/null - pkgmk ${PKGMK_CMD[@]} || exit $? + cd $r/$p >/dev/null 2>&1 + echo "$r/$p" + pkgmk $PKGMK_CMD || exit $? #[ -e bootstrap-post-install ] && sh bootstrap-post-install - [ -e post-install ] && sh post-install - cd - &>/dev/null + if [ -x post-install ]; then + ./post-install || true + fi + cd - >/dev/null 2>&1 fi done if [ "$PKGFOUND" = "no" ]; then diff --git a/pkgadd.conf b/pkgadd.conf deleted file mode 100644 index 2ffe323..0000000 --- a/pkgadd.conf +++ /dev/null @@ -1,69 +0,0 @@ -# -# /etc/pkgadd.conf: pkgadd(8) configuration -# - -# Default rule (implicit) -#UPGRADE ^.*$ YES - -UPGRADE ^etc/.*$ NO -UPGRADE ^var/log/.*$ NO -UPGRADE ^var/spool/\w*cron/.*$ NO -UPGRADE ^var/run/utmp$ NO - -UPGRADE ^etc/ports/drivers/.*$ YES -UPGRADE ^etc/X11/.*$ YES - -UPGRADE ^etc/rc.*$ YES -UPGRADE ^etc/rc\.local$ NO -UPGRADE ^etc/rc\.modules$ NO -UPGRADE ^etc/rc\.conf$ NO -UPGRADE ^etc/rc\.d/net$ NO -UPGRADE ^etc/rc\.d/wlan$ NO - -UPGRADE ^etc/udev/rules.d/.*$ YES -UPGRADE ^etc/udev/rules.d/1.*$ NO -UPGRADE ^etc/udev/hwdb.d/.*$ YES -UPGRADE ^etc/udev/hwdb.bin$ YES - -UPGRADE ^etc/ssl/cert.pem$ YES - -UPGRADE ^(dev|proc|sys|run)/.*$ NO - -# locales -INSTALL ^usr/share/locale/.*$ NO - -# possible conflicts files -INSTALL ^.*/perllocal.pod$ NO -INSTALL ^.*/fonts.dir$ NO -INSTALL ^.*/fonts.scale$ NO -INSTALL ^.*/info/dir$ NO - -# dont install libtool files by default -INSTALL ^.*/.*\.la$ NO - -# imagemagick's libtool -INSTALL ^.*/ImageMagick-.*/.*\.la$ YES -INSTALL ^.*/libMagick.*\.la$ YES - -# dont install static libraries by default -INSTALL ^.*\.a$ NO - -# install openjpeg static lib, required by poppler -INSTALL ^usr/lib/libopenjp2.a$ YES - -# static libraries required for static pkgutils -INSTALL ^.*/lib(z|lzma|zstd|archive|crypto|acl|expat|bz2)\.a$ YES - -# gcc static libraries -INSTALL ^.*/libstdc\+\+\.a$ YES -INSTALL ^.*/lib(gcc|gcc_eh|gcov)\.a$ YES - -# glibc static libraries -INSTALL ^.*/lib(c|g|dl|m|m-.*|mvec|pthread|rt|util)\.a$ YES -INSTALL ^.*/.*nonshared\.a$ YES - -# only install 'man[1-8]' man pages -INSTALL ^usr/share/man/.*$ NO -INSTALL ^usr/share/man/man[1-8]/.*$ YES - -# End of file diff --git a/ports/core/REPO b/ports/core/REPO index 38f8f7c..b25d2f7 100644 --- a/ports/core/REPO +++ b/ports/core/REPO @@ -52,6 +52,7 @@ d:iptables d:man-pages d:ncurses d:pkgutils +d:signify d:readline d:gmp d:texinfo @@ -283,12 +284,16 @@ f:fa7bf6af673e886ed253e922a957ba32:man-pages/.footprint f:663e14a0f4637f22b4b422428dc07b4d:ncurses/Pkgfile f:01f6690358d37199ed3e481cca96368e:ncurses/.signature f:dd9f41e7b33edccfc57323d51532d8c9:ncurses/.footprint -f:a527bd9c08c9180bf50a571d3fd24d0d:pkgutils/Pkgfile +f:7a125eee93f294b488b3b4f38ee0a3ab:pkgutils/Pkgfile f:468a4d0cd212769920fa6b4fe491ea6e:pkgutils/pkgadd.conf -f:da1629addb130023a97c9fd158938d74:pkgutils/.signature -f:9d29d752c3bb78a7c8f4eab3a305d077:pkgutils/extension -f:851306119a85f75d0f5ef5c1ebf2b8f0:pkgutils/.footprint -f:5e97fae9668bbc64b8cc26ec2f9f880c:pkgutils/pkgmk.conf +f:e5bccaeaabd407f5ff6c415e296fadb1:pkgutils/.signature +f:b1cade32f583c91717c7f78b6577083e:pkgutils/extension +f:f1de037f285c72752b6f7646cafadbca:pkgutils/.footprint +f:91aba8368bbf919aa15da1b9e779dbf4:pkgutils/pkgmk.conf +f:56052da3f97f35e7bef318f4216ed888:signify/Pkgfile +f:1ec6188cd775f3198e8716a4b40a1230:signify/cruxify.patch +f:9fff9d41462d842db7853ecc18416c29:signify/.signature +f:a98cb3bec29ec19898280d032258b09a:signify/.footprint f:9c18eb7af2bb91638f583ff5c4d05358:readline/Pkgfile f:b99f92e04c681d2200266f77b2943b47:readline/.signature f:dd1764b84cfca6b677f44978218a75da:readline/readline-8.2-upstream_fix-1.patch diff --git a/ports/core/pkgutils/.footprint b/ports/core/pkgutils/.footprint index 6853600..ca1ef32 100644 --- a/ports/core/pkgutils/.footprint +++ b/ports/core/pkgutils/.footprint @@ -21,6 +21,11 @@ drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/pkgrm.8.gz -rw-r--r-- root/root usr/share/man/man8/rejmerge.8.gz drwxr-xr-x root/root var/ +drwxr-xr-x root/root var/cache/ +drwxrwxrwx root/root var/cache/pkg/ +drwxrwxrwx root/root var/cache/pkg/packages/ +drwxrwxrwx root/root var/cache/pkg/sources/ +drwxrwxrwx root/root var/cache/pkg/work/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/pkgmk/ -rw-r--r-- root/root var/lib/pkgmk/extension diff --git a/ports/core/pkgutils/.signature b/ports/core/pkgutils/.signature index 8ce431e..8a5a92b 100644 --- a/ports/core/pkgutils/.signature +++ b/ports/core/pkgutils/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/core.pub -RWQj+xHX75A5zGOrwGFIYO2BQxBcWjh8cZ8Q8ObbszmXFfJGVV5VpsB07TAbm6rFxDyrtcVMLRYejkoDwOxSN4yj7lEbN6ImqQA= -SHA256 (Pkgfile) = 976dd40abc348687602a36593e12de28c07633d8ad01e4dcdc35940879361d58 -SHA256 (.footprint) = 1586ed7a881f65b433cedb4c646b7741a211b61c481be921ab8800624e932f0d +RWQj+xHX75A5zOuQa46A+JyCUcEmwyfEufm6zHPmmNjhT2CncO+gvGhiC1kzbvXJTnUi+XscgtQC1MYNSIMqNZeD5SBA88OKEAw= +SHA256 (Pkgfile) = 406d5f8ea0bec877b1e6df99b11e09489003adc45f0e3d2d0e3c93e02f4fc1b3 +SHA256 (.footprint) = 670b56b011f2d2262b3d21eed2280657e1bd9c957745eeadf628f09bdbcc779c SHA256 (pkgutils-5.40.10.tar.xz) = 2d86335be3d0452dcc7ae5f568e7296cd7ea80117f57646d15420a6dc192f174 SHA256 (pkgadd.conf) = a23ef762fc1468b4bf85e351103abcb927ae7e69ee19a4b72eaa2d3f070e3111 -SHA256 (pkgmk.conf) = afed9089d65fc63b7792ccaeed7cde43931b17985c37bdcc876dd080f6535735 -SHA256 (extension) = cde2ab0c925e7447790c0538d849f077e49094dc736e0bc2cafc66907d7a1c93 +SHA256 (pkgmk.conf) = a7de66b8974f641497e8925aab72871a3a54e9a3c78d91f2c60c883bc6855e58 +SHA256 (extension) = 920deca4d2e698f2f55205c0ebd78777eea5a758ca816659d37ef2d2e87956eb diff --git a/ports/core/pkgutils/Pkgfile b/ports/core/pkgutils/Pkgfile index a81985d..2940955 100644 --- a/ports/core/pkgutils/Pkgfile +++ b/ports/core/pkgutils/Pkgfile @@ -13,6 +13,13 @@ bootstrap_build() { } post_build() { + # change some defaults + sed -i 's,PKGMK_SOURCE_DIR=.*,PKGMK_SOURCE_DIR="/var/cache/pkg/sources",' $PKG/usr/bin/pkgmk + sed -i 's,PKGMK_PACKAGE_DIR=.*,PKGMK_PACKAGE_DIR="/var/cache/pkg/packages",' $PKG/usr/bin/pkgmk + sed -i 's,PKGMK_WORK_DIR=.*,PKGMK_WORK_DIR="/var/cache/pkg/work",' $PKG/usr/bin/pkgmk + sed -i 's,PKGMK_COMPRESSION_MODE=.*,PKGMK_COMPRESSION_MODE="xz",' $PKG/usr/bin/pkgmk + install -dm777 $PKG/var/cache/pkg/{sources,packages,work} + chmod 777 $PKG/var/cache/pkg install -Dm644 $SRC/extension $PKG/var/lib/pkgmk/extension install -m644 $SRC/pkgadd.conf $PKG/etc/pkgadd.conf install -m644 $SRC/pkgmk.conf $PKG/etc/pkgmk.conf diff --git a/ports/core/pkgutils/extension b/ports/core/pkgutils/extension index 5ecc9d2..8915301 100644 --- a/ports/core/pkgutils/extension +++ b/ports/core/pkgutils/extension @@ -193,7 +193,6 @@ build() { mv $PKG $PKG-old mv $PKG-32 $PKG fi - if [ "$(command -v post_build)" ]; then post_build fi diff --git a/ports/core/pkgutils/pkgmk.conf b/ports/core/pkgutils/pkgmk.conf index 67ef518..33e6f96 100644 --- a/ports/core/pkgutils/pkgmk.conf +++ b/ports/core/pkgutils/pkgmk.conf @@ -9,9 +9,9 @@ export JOBS=$(nproc) export MAKEFLAGS="-j $JOBS" # PKGMK_SOURCE_MIRRORS=() -# PKGMK_SOURCE_DIR="$PWD" -# PKGMK_PACKAGE_DIR="$PWD" -# PKGMK_WORK_DIR="$PWD/work" +# PKGMK_SOURCE_DIR="/var/cache/pkg/sources" +# PKGMK_PACKAGE_DIR="/var/cache/pkg/packages" +# PKGMK_WORK_DIR="/var/cache/pkg/work" # PKGMK_DOWNLOAD="no" # PKGMK_IGNORE_SIGNATURE="no" # PKGMK_IGNORE_MD5SUM="no" @@ -21,7 +21,7 @@ export MAKEFLAGS="-j $JOBS" # PKGMK_DOWNLOAD_PROG="curl" # PKGMK_WGET_OPTS="" # PKGMK_CURL_OPTS="" -# PKGMK_COMPRESSION_MODE="gz" +# PKGMK_COMPRESSION_MODE="xz" # ccache export PATH="/usr/lib/ccache:$PATH" diff --git a/ports/extra/signify/.footprint b/ports/core/signify/.footprint similarity index 100% rename from ports/extra/signify/.footprint rename to ports/core/signify/.footprint diff --git a/ports/extra/signify/.signature b/ports/core/signify/.signature similarity index 100% rename from ports/extra/signify/.signature rename to ports/core/signify/.signature diff --git a/ports/extra/signify/Pkgfile b/ports/core/signify/Pkgfile similarity index 100% rename from ports/extra/signify/Pkgfile rename to ports/core/signify/Pkgfile diff --git a/ports/extra/signify/cruxify.patch b/ports/core/signify/cruxify.patch similarity index 100% rename from ports/extra/signify/cruxify.patch rename to ports/core/signify/cruxify.patch diff --git a/ports/extra/REPO b/ports/extra/REPO index 2545808..d52a25d 100644 --- a/ports/extra/REPO +++ b/ports/extra/REPO @@ -117,6 +117,7 @@ d:murrine d:libxshmfence d:dav1d d:yaml +d:xf86-input-synaptics d:xrefresh d:libmediainfo d:pango @@ -253,7 +254,6 @@ d:inkscape d:graphite2 d:pcre d:nodejs -d:signify d:wayland-protocols d:sessreg d:openssh @@ -669,7 +669,7 @@ f:5bf49138d72bb845c5be82ed7f876ba0:itstool/Pkgfile f:29b7330d0ebe2b85e08291bf9ff6b86c:itstool/.signature f:650b86fe587074ef5a2b3869d9bc4c18:itstool/update f:3fcccef151712aa244e8f2462e604fe6:itstool/.footprint -f:2fe083ad0014ea23781674c20cd90a9d:ffmpeg/Pkgfile +f:5a2825da92fa9e96dd784546c317fc00:ffmpeg/Pkgfile f:e1972cc809fe72a8b8a711c8896ffa41:ffmpeg/ffmpeg-6.0-chromium_method-1.patch f:ff2716aad4adde40ea3bb39f93171a85:ffmpeg/.signature f:a6822b9dfe4fd09184c61035158587fb:ffmpeg/update @@ -813,9 +813,10 @@ f:15a5d01dfde6419a2dcdafe4a38521cc:libxtst/.signature f:a3ed9bad9712c4593aff01ee6bb6dee3:libxtst/.footprint f:092065198db545b3dc1d200fddcef263:xlsclients/Pkgfile f:93ca99e05c7a55fb216c74cf2ae11b46:xlsclients/.signature -f:b9029ddb1893eeef93a772447396414e:gpicview/Pkgfile -f:82669c7f9004080606c1d6a863be3c63:gpicview/.signature -f:5a3b00fd72b211837563e27e412239c8:gpicview/.footprint +f:d3958dc43e5d1e9c439f96937d4c879b:gpicview/Pkgfile +f:52c2306809efd68d7fbed4dfd94a7000:gpicview/.signature +f:2762dc6d7b4f39f6c4009aebd0ce0355:gpicview/gpicview.appdata.xml +f:2432d9b41caf80500e0968133faa6e30:gpicview/.footprint f:a610ee6f1a164d03f4e0b3d0d1abfbf9:rsync/Pkgfile f:cd56fc0201fa06ff8d3da97cf452ba8c:rsync/.signature f:19b6e2c20c26deadafb5f39b33945bc8:rsync/.footprint @@ -830,6 +831,10 @@ f:698ca2635e3cb3c91370bf3ffc571bb3:dav1d/.signature f:811492fb9ad3f215497e33933ea0aa07:dav1d/.footprint f:536435141694766ca7df7a95d5ca4fe6:yaml/Pkgfile f:314f7bac435d645163fe55b48d9d86c6:yaml/.signature +f:e730e205c6e1b669bcbe12c2fdc92680:xf86-input-synaptics/Pkgfile +f:390a67daf04910da0c3b216c7fe3a060:xf86-input-synaptics/.signature +f:3f7c08db10d73e2311faa439b4b0c90c:xf86-input-synaptics/50-synaptics.conf +f:dcbbfc1beef65e336842d4694288342b:xf86-input-synaptics/.footprint f:a28c549df40b3ad81749c261c9a0c963:xrefresh/Pkgfile f:259e9c510d8239353277f47a2fdc83ca:xrefresh/.signature f:232ebc96c177033e1c2c5e45df0e205f:libmediainfo/Pkgfile @@ -1291,10 +1296,6 @@ f:d23c3b454b391c95e014248554368a2a:nodejs/Pkgfile f:7465a02d5aad9828c5c44721cfc61142:nodejs/.signature f:57c0d7e4214ed4e5e07ad744239a0b3d:nodejs/update f:cdcf0e8e57d3f91638d68c93a5f774a7:nodejs/.footprint -f:56052da3f97f35e7bef318f4216ed888:signify/Pkgfile -f:1ec6188cd775f3198e8716a4b40a1230:signify/cruxify.patch -f:9fff9d41462d842db7853ecc18416c29:signify/.signature -f:a98cb3bec29ec19898280d032258b09a:signify/.footprint f:42b4ac839616e8c2c200b652a4f8bad6:wayland-protocols/Pkgfile f:14bff77da95b2443748878d7b8768e5b:wayland-protocols/.signature f:60f59c4215812123ec1149de1ebf5671:wayland-protocols/update diff --git a/ports/extra/ffmpeg/Pkgfile b/ports/extra/ffmpeg/Pkgfile index 8bdc6f3..a9a5633 100644 --- a/ports/extra/ffmpeg/Pkgfile +++ b/ports/extra/ffmpeg/Pkgfile @@ -1,4 +1,4 @@ -# Depends on: nasm libaom libtheora opus libass fdk-aac lame libvpx x264 x265 +# Depends on: nasm libaom libtheora opus libass fdk-aac lame libvpx x264 x265 libxv name=ffmpeg version=6.0 diff --git a/ports/extra/gpicview/.footprint b/ports/extra/gpicview/.footprint index 8b22b42..9ace9dc 100644 --- a/ports/extra/gpicview/.footprint +++ b/ports/extra/gpicview/.footprint @@ -17,3 +17,5 @@ drwxr-xr-x root/root usr/share/icons/hicolor/ drwxr-xr-x root/root usr/share/icons/hicolor/48x48/ drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/gpicview.png +drwxr-xr-x root/root usr/share/metainfo/ +-rw-r--r-- root/root usr/share/metainfo/gpicview.appdata.xml diff --git a/ports/extra/gpicview/.signature b/ports/extra/gpicview/.signature index 79a1d5b..035f9e1 100644 --- a/ports/extra/gpicview/.signature +++ b/ports/extra/gpicview/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/extra.pub -RWQj+xHX75A5zNk6FNXJJPFoZqeJAZgfjGLdptTFzGbmBliUQIZa4TiT41DuSz+SqKZkVKgnoCvK/Mx+tUjCpVuxqcVtw3i0wws= -SHA256 (Pkgfile) = 510165223fc6249c4d4bd460578f13871b25476e36e058f5dead456b03fcadf3 +RWQj+xHX75A5zIos2O/vC7rs2LnuEAVGh1B/bob8HwNYytN4kgSjysN2Ab8II1js42vpRsr/wNfoUokLPVaXf6P5PeIi0NlMlwk= +SHA256 (Pkgfile) = d3a9e239685b9e9a88f45d48a0132b90bf5872c4184ed68a6ab88f48a026a7de SHA256 (.footprint) = 113c6cd0f5a98f815bdf748a94ddf4ce26563bce914f5258bd9bf6907709a86f SHA256 (gpicview-0.2.5.tar.xz) = 38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942 +SHA256 (gpicview.appdata.xml) = dab79b2be536005044cc5edcc4f47e9f407a5fcf3126110a1ef2ab65c873dbf7 diff --git a/ports/extra/gpicview/Pkgfile b/ports/extra/gpicview/Pkgfile index 375886e..69cbb02 100644 --- a/ports/extra/gpicview/Pkgfile +++ b/ports/extra/gpicview/Pkgfile @@ -3,4 +3,9 @@ name=gpicview version=0.2.5 release=1 -source=(https://downloads.sourceforge.net/lxde/$name-$version.tar.xz) +source=(https://downloads.sourceforge.net/lxde/$name-$version.tar.xz + $name.appdata.xml) + +post_build() { + install -Dm644 $SRC/$name.appdata.xml $PKG/usr/share/metainfo/$name.appdata.xml +} diff --git a/ports/extra/gpicview/gpicview.appdata.xml b/ports/extra/gpicview/gpicview.appdata.xml new file mode 100644 index 0000000..d4d1261 --- /dev/null +++ b/ports/extra/gpicview/gpicview.appdata.xml @@ -0,0 +1,29 @@ + + + org.lxde.gpicview + gpicview.desktop + Image Viewer + View your images easily + CC0-1.0 + GPL-2.0 + LXDE team + +

GPicView is the standard picture viewer of LXDE. GPicView features lightning fast startup and an intuitive interface.

+

Features:

+ + + + + https://wiki.lxde.org/en/images/9/9e/Gpicview.png + + + https://sourceforge.net/p/lxde/bugs/search/?q=labels:gpicview + https://www.lxde.org/ + gpicview + diff --git a/ports/extra/xf86-input-synaptics/.footprint b/ports/extra/xf86-input-synaptics/.footprint new file mode 100644 index 0000000..0133831 --- /dev/null +++ b/ports/extra/xf86-input-synaptics/.footprint @@ -0,0 +1,25 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/synclient +-rwxr-xr-x root/root usr/bin/syndaemon +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/xorg/ +-rw-r--r-- root/root usr/include/xorg/synaptics-properties.h +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/xorg-synaptics.pc +drwxr-xr-x root/root usr/lib/xorg/ +drwxr-xr-x root/root usr/lib/xorg/modules/ +drwxr-xr-x root/root usr/lib/xorg/modules/input/ +-rwxr-xr-x root/root usr/lib/xorg/modules/input/synaptics_drv.so +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/X11/ +drwxr-xr-x root/root usr/share/X11/xorg.conf.d/ +-rw-r--r-- root/root usr/share/X11/xorg.conf.d/50-synaptics.conf +-rw-r--r-- root/root usr/share/X11/xorg.conf.d/70-synaptics.conf +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/synclient.1.gz +-rw-r--r-- root/root usr/share/man/man1/syndaemon.1.gz +drwxr-xr-x root/root usr/share/man/man4/ +-rw-r--r-- root/root usr/share/man/man4/synaptics.4.gz diff --git a/ports/extra/xf86-input-synaptics/.signature b/ports/extra/xf86-input-synaptics/.signature new file mode 100644 index 0000000..554a0f7 --- /dev/null +++ b/ports/extra/xf86-input-synaptics/.signature @@ -0,0 +1,6 @@ +untrusted comment: verify with /etc/ports/extra.pub +RWQj+xHX75A5zLPINd+OXpHM4/+wQfDQ3YCj7qelGWTMWAa+Q2mf6acxnUKmJGADb6j6dQyaEMLjK/W39/dW0zB6LAI3IPMxVQc= +SHA256 (Pkgfile) = e7d92288ce1dee83c2e65cc0ad31e6bb6e8f42aa07934257623c1c136bf36164 +SHA256 (.footprint) = 2cb1bd8ccf6a3f8358c186aaa8ec35a625f62d1e5ceffd11a2897dcf7fa53394 +SHA256 (xf86-input-synaptics-1.9.2.tar.xz) = b8fa4aab913fc63754bbd6439e020658c412743a055201ddf212760593962c38 +SHA256 (50-synaptics.conf) = 8d9ae8f5466e8273d2b13f8266d82cf5b2cb8204aa03e05e209940e747772c23 diff --git a/ports/extra/xf86-input-synaptics/50-synaptics.conf b/ports/extra/xf86-input-synaptics/50-synaptics.conf new file mode 100644 index 0000000..09c3764 --- /dev/null +++ b/ports/extra/xf86-input-synaptics/50-synaptics.conf @@ -0,0 +1,15 @@ +# DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN ON UPGRADES +# Copy this file to /etc/X11/xorg.conf.d/ and edit the copy +# +# Use "synclient -l" to see all available options +# Use "man synaptics" for details about what the options do +# +Section "InputClass" + Identifier "touchpad" + Driver "synaptics" + MatchDevicePath "/dev/input/event*" + MatchIsTouchpad "on" + Option "TapButton1" "1" + Option "TapButton2" "2" + Option "TapButton3" "3" +EndSection diff --git a/ports/extra/xf86-input-synaptics/Pkgfile b/ports/extra/xf86-input-synaptics/Pkgfile new file mode 100644 index 0000000..831e8a0 --- /dev/null +++ b/ports/extra/xf86-input-synaptics/Pkgfile @@ -0,0 +1,9 @@ +name=xf86-input-synaptics +version=1.9.2 +release=1 +source=(https://www.x.org/pub/individual/driver/$name-$version.tar.xz + 50-synaptics.conf) + +post_build() { + install -m644 $SRC/50-synaptics.conf $PKG/usr/share/X11/xorg.conf.d/ +}