upg rsync mesa

add mat2 python-pyexiftool
2022-09-27 16:26:10 +03:00 · 2022-09-27 16:26:10 +03:00 · 28e1127410
commit 28e1127410
parent f9dfbe6b53
17 changed files with 308 additions and 42 deletions
--- a/mat/note
+++ b/mat/note
@ -0,0 +1 @@
+python2 and utilities was removed from Arch, so this doesn't build anymore, try mat2
--- a/mat2/PKGBUILD
+++ b/mat2/PKGBUILD
@ -0,0 +1,54 @@
+#!/usr/bin/bash
+# JOBoRun		: Jwm OpenBox Obarun RUNit
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
+# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
+# Website		: https://pozol.eu
+#-----------------------------------------| DESCRIPTION |---------------------------------------
+
+pkgname=mat2
+pkgver=0.13.0.4.gcc5be86
+pkgrel=02
+pkgdesc='Metadata removal tool, supporting a wide range of commonly used file formats'
+url='https://0xacab.org/jvoisin/mat2'
+arch=('any')
+depends=('python' 'python-mutagen' 'python-cairo' 'python-gobject' 'gdk-pixbuf2' 'poppler-glib' 'librsvg' 'perl-image-exiftool' 'mailcap')
+makedepends=('python-setuptools' git)
+optdepends=(
+  'ffmpeg: video support'
+  'bubblewrap: sandboxing support'
+)
+checkdepends=('ffmpeg')
+conflicts=(mat mat2-git)
+provides=(mat mat-git mat2-git)
+source=("git+https://0xacab.org/jvoisin/${pkgname}.git")
+
+pkgver() {
+    cd "${srcdir}/${pkgname}"
+    local ver="$(git describe --tags | sed 's|-|\.|g')"
+    printf "%s" "${ver//-/.}"
+}
+build() {
+    cd "${srcdir}/${pkgname}"
+    export PYTHONHASHSEED=0
+    python setup.py build
+}
+
+check() {
+    cd "${srcdir}/${pkgname}"
+    python -m unittest discover -v
+}
+
+package() {
+    cd "${srcdir}/${pkgname}"
+    python setup.py install --skip-build -O1 --root="${pkgdir}"
+    install -Dm 644 dolphin/mat2.desktop -t "${pkgdir}/usr/share/kservices5/ServiceMenus"
+    install -Dm 644 doc/mat2.1 -t "${pkgdir}/usr/share/man/man1"
+    install -Dm 644 doc/*.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
+
+#---- license gpg-key sha256sums ----
+
+license=('LGPL3')
+
+sha256sums=(SKIP)
+
--- a/mat2/PKGBUILD-aur
+++ b/mat2/PKGBUILD-aur
@ -0,0 +1,47 @@
+# Maintainer: Yardena Cohen <yardenack@gmail.com>
+# Contributor: kpcyrd <kpcyrd[at]archlinux[dot]org>
+# Contributor: Francois Boulogne <devel at sciunto dot org>
+
+gitname=mat2
+pkgname=${gitname}-git
+pkgver=0.12.3.1.g3509256
+pkgrel=1
+pkgdesc='Metadata removal tool, supporting a wide range of commonly used file formats'
+url='https://0xacab.org/jvoisin/mat2'
+arch=('any')
+license=('LGPL3')
+depends=('python' 'python-mutagen' 'python-cairo' 'python-gobject' 'gdk-pixbuf2' 'poppler-glib' 'librsvg' 'perl-image-exiftool' 'mailcap')
+makedepends=('python-setuptools' git)
+optdepends=(
+  'ffmpeg: video support'
+  'bubblewrap: sandboxing support'
+)
+checkdepends=('ffmpeg')
+conflicts=(mat mat-git mat2)
+provides=(mat mat-git mat2)
+source=("git+https://0xacab.org/jvoisin/${gitname}.git")
+sha512sums=('SKIP')
+
+pkgver() {
+    cd "${srcdir}/${gitname}"
+    local ver="$(git describe --tags | sed 's|-|\.|g')"
+    printf "%s" "${ver//-/.}"
+}
+build() {
+    cd "${srcdir}/${gitname}"
+    export PYTHONHASHSEED=0
+    python setup.py build
+}
+
+check() {
+    cd "${srcdir}/${gitname}"
+    python -m unittest discover -v
+}
+
+package() {
+    cd "${srcdir}/${gitname}"
+    python setup.py install --skip-build -O1 --root="${pkgdir}"
+    install -Dm 644 dolphin/mat2.desktop -t "${pkgdir}/usr/share/kservices5/ServiceMenus"
+    install -Dm 644 doc/mat2.1 -t "${pkgdir}/usr/share/man/man1"
+    install -Dm 644 doc/*.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
--- a/mat2/clean
+++ b/mat2/clean
@ -0,0 +1 @@
+rm -rf {src,pkg,mat2}
--- a/mat2/deps
+++ b/mat2/deps
@ -0,0 +1,14 @@
+python
+python-mutagen
+python-cairo
+python-gobject
+gdk-pixbuf2
+poppler-glib
+librsvg
+perl-image-exiftool
+mailcap
+python-setuptools
+git
+ffmpeg
+gettext 
+jack2 
--- a/mat2/time
+++ b/mat2/time
@ -0,0 +1,6 @@
+
+
+real	1m55.032s
+user	1m19.692s
+sys	0m4.993s
+ 
--- a/mesa/PKGBUILD
+++ b/mesa/PKGBUILD
@ -8,7 +8,7 @@
 pkgbase=mesa
 pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification w/o zstd"
-pkgver=22.1.7
+pkgver=22.2.0
 pkgrel=01
 arch=('x86_64')
 #options=(debug)  #  uncomment this if you want the debug package built
@ -32,9 +32,6 @@ build() {
  # Build only minimal debug info to reduce size
  CFLAGS+=' -g1'
  CXXFLAGS+=' -g1'
-  # https://gitlab.freedesktop.org/mesa/mesa/-/issues/6229
-  CFLAGS+=' -mtls-dialect=gnu'
-  CXXFLAGS+=' -mtls-dialect=gnu'

  arch-meson mesa-$pkgver build \
    -D b_ndebug=false \
@ -64,6 +61,7 @@ build() {
    -D zstd=disabled \
    -D shared-glapi=enabled \
    -D microsoft-clc=disabled \
+    -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \
    -D valgrind=enabled

  # Print config
@ -224,8 +222,8 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l
              '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <dylan@pnwbakers.com>
              '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric@engestrom.ch>

-sha256sums=(da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89 # mesa-22.1.7.tar.xz
-	dd6d9323c0bd66b0e55b4ce35f641334a7f9c940f6a36840b9a301b5c496f0e8 # mesa-22.1.7.tar.xz.sig
+sha256sums=(b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c # mesa-22.2.0.tar.xz
+	31e1dae89bbac3bc297c573f93f48363a521513480ec98b5e8b53d7399f5a646 # mesa-22.2.0.tar.xz.sig
 	7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
- 
- 
+
+
--- a/mesa/PKGBUILD-arch
+++ b/mesa/PKGBUILD-arch
@ -6,7 +6,7 @@
 pkgbase=mesa
 pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=22.1.7
+pkgver=22.2.0
 pkgrel=1
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
@ -18,7 +18,7 @@ license=('custom')
 options=('debug')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
        LICENSE)
-sha512sums=('447e87359445edce231761d94b316b2aa20e9ab58e4b59d75cbb1696dd0900e7164c32bebc3b75700b4070570b456f7a8cf0914181371754a52427d34e4b9120'
+sha512sums=('13a21b9ed6b0a5dfd0293b73df271a929c3155d83e8beb3d958fe18d79277f3611bf5b26a1186d446f4e1479a36bb13d0a13d6ac68937989fe7a0d917e12171e'
            'SKIP'
            'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov@gmail.com>
@ -38,10 +38,6 @@ build() {
  CFLAGS+=' -g1'
  CXXFLAGS+=' -g1'

-  # https://gitlab.freedesktop.org/mesa/mesa/-/issues/6229
-  CFLAGS+=' -mtls-dialect=gnu'
-  CXXFLAGS+=' -mtls-dialect=gnu'
-
  arch-meson mesa-$pkgver build \
    -D b_ndebug=true \
    -D platforms=x11,wayland \
@ -69,6 +65,7 @@ build() {
    -D osmesa=true \
    -D shared-glapi=enabled \
    -D microsoft-clc=disabled \
+    -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \
    -D valgrind=enabled

  # Print config
--- a/mesa/deps
+++ b/mesa/deps
@ -28,3 +28,4 @@ byacc
 polly
 libmicrohttpd

+
--- a/mesa/time
+++ b/mesa/time
@ -17,8 +17,16 @@ real	36m51.129s
 user	136m24.239s
 sys	3m47.587s

+
 mesa 22.1.5-01 
 real	35m39.106s
 user	134m11.846s
 sys	3m50.215s

+
+
+mesa 22.2.0-01
+real	36m48.135s
+user	138m16.376s
+sys	4m38.382s
+ 
--- a/python-pyexiftool/PKGBUILD
+++ b/python-pyexiftool/PKGBUILD
@ -0,0 +1,42 @@
+#!/usr/bin/bash
+# JOBoRun		: Jwm OpenBox Obarun RUNit
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
+# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
+# Website		: https://pozol.eu
+#-----------------------------------------| DESCRIPTION |---------------------------------------
+
+pkgbase=pyexiftool
+_pkgname=PyExifTool
+pkgname='python-pyexiftool'
+pkgver=0.5.4
+pkgrel=02
+pkgdesc="Library to communicate with an instance of ExifTool command-line application"
+arch=('any')
+url="https://github.com/sylikc/${pkgbase}"
+makedepends=("python-pip")
+_pkgname_prefix="${_pkgname:0:1}"
+_pkgname_underscored="${_pkgname//-/_}"
+_pkgurl="https://files.pythonhosted.org/packages/py3/$_pkgname_prefix/$_pkgname/$_pkgname_underscored-$pkgver-py3-none-any.whl"
+source=("$_pkgurl")
+
+package() {
+  cd "$srcdir" || exit
+  PIP_CONFIG_FILE=/dev/null pip install \
+    --root="$pkgdir" \
+    --isolated \
+    --ignore-installed \
+    --no-deps \
+    --no-compile \
+    --no-warn-script-location \
+    ${_pkgname//-/_}-$pkgver-py3-none-any.whl
+  python -O -m compileall -s "$pkgdir" "$pkgdir/usr/lib/"
+  mapfile -t direct_url_file < <(find "$pkgdir"/usr/lib -type f -name 'direct_url.json')
+  rm -rvf "${direct_url_file[@]}" || true
+  install -Dm644 "${_pkgname//-/_}-$pkgver.dist-info/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+#---- license gpg-key sha256sums ----
+
+license=("GPL3")
+
+sha256sums=(a223852c8899cb118858439b610c820cc5284843f017e42c50d0f13099d6ea15) # PyExifTool-0.5.4-py3-none-any.whl
--- a/python-pyexiftool/PKGBUILD-aur
+++ b/python-pyexiftool/PKGBUILD-aur
@ -0,0 +1,36 @@
+# Maintainer: samarthj <dev@samarthj.com>
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
+
+# shellcheck disable=2034,2148,2154
+
+pkgbase=pyexiftool
+_pkgname=PyExifTool
+pkgname='python-pyexiftool'
+pkgver=0.5.4
+pkgrel=1
+pkgdesc="Library to communicate with an instance of ExifTool command-line application"
+arch=('any')
+url="https://github.com/sylikc/${pkgbase}"
+license=("GPL3")
+makedepends=("python-pip")
+_pkgname_prefix="${_pkgname:0:1}"
+_pkgname_underscored="${_pkgname//-/_}"
+_pkgurl="https://files.pythonhosted.org/packages/py3/$_pkgname_prefix/$_pkgname/$_pkgname_underscored-$pkgver-py3-none-any.whl"
+source=("$_pkgurl")
+sha512sums=('b83607a01878506174b674be3be10773b12c5c674ba1fc1e1ca46ae7fcb037da3b4c4a99d1fafc4369a413cd472588f3109fe9c85d1c3607a58983e4249e1e46')
+
+package() {
+  cd "$srcdir" || exit
+  PIP_CONFIG_FILE=/dev/null pip install \
+    --root="$pkgdir" \
+    --isolated \
+    --ignore-installed \
+    --no-deps \
+    --no-compile \
+    --no-warn-script-location \
+    ${_pkgname//-/_}-$pkgver-py3-none-any.whl
+  python -O -m compileall -s "$pkgdir" "$pkgdir/usr/lib/"
+  mapfile -t direct_url_file < <(find "$pkgdir"/usr/lib -type f -name 'direct_url.json')
+  rm -rvf "${direct_url_file[@]}" || true
+  install -Dm644 "${_pkgname//-/_}-$pkgver.dist-info/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
--- a/python-pyexiftool/clean
+++ b/python-pyexiftool/clean
@ -0,0 +1 @@
+rm -rf {src,pkg,PyExif*.whl}
--- a/python-pyexiftool/deps
+++ b/python-pyexiftool/deps
@ -0,0 +1 @@
+python-pip
--- a/python-pyexiftool/time
+++ b/python-pyexiftool/time
@ -0,0 +1,6 @@
+
+
+real	0m2.625s
+user	0m1.989s
+sys	0m0.273s
+ 
--- a/rsync/PKGBUILD
+++ b/rsync/PKGBUILD
@ -8,7 +8,7 @@
 pkgname=rsync
 _tag='40695f1e31d29e5d715d986a53cdad1fe0ce0210' # git rev-parse v${pkgver}
 pkgver=3.2.6
-pkgrel=01
+pkgrel=02
 pkgdesc='A fast and versatile file copying tool for remote and local files w/o systemd zstd ipv6'
 arch=('x86_64')
 url='https://rsync.samba.org/'
@ -21,11 +21,35 @@ backup=('etc/rsyncd.conf'
 source=("git+https://github.com/WayneD/rsync#tag=${_tag}?signed"
        'rsyncd.conf')

-#prepare() {
-#	cd "$srcdir/rsync"
-#
-#	git merge --ff-only 'cff8f044776c5143a5b270969d4bb0f1fea8b017'
-#}
+_backports=(
+  # Fix really silly bug with --relative rules.
+  '464555ea923b32f3504678d05bc7de9205e5c8da'
+
+  # Fix bug with validing remote filter rules.
+  '950730313de994d191ba2d5be575e97690b355e8'
+)
+
+_reverts=(
+)
+
+prepare() {
+
+  cd "$srcdir/rsync"
+
+  local _c
+  for _c in "${_backports[@]}"; do
+    if [[ $_c == *..* ]]; then
+      git log --oneline --reverse "${_c}"
+    else
+      git log --oneline -1 "${_c}"
+    fi
+    git cherry-pick -n -m1 "${_c}"
+  done
+  for _c in "${_reverts[@]}"; do
+    git log --oneline -1 "${_c}"
+    git revert -n "${_c}"
+  done
+}

 build() {
 	cd "$srcdir/rsync"
@ -63,6 +87,6 @@ validpgpkeys=(0048C8B026D4C96F0E589C2F6C859FB14B96A8C5) # Wayne Davison <wayned@

 sha256sums=(SKIP
            733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b) # rsyncd.conf
- 
- 
- 
+
+
+
--- a/rsync/PKGBUILD-arch
+++ b/rsync/PKGBUILD-arch
@ -3,7 +3,7 @@
 pkgname=rsync
 _tag='40695f1e31d29e5d715d986a53cdad1fe0ce0210' # git rev-parse v${pkgver}
 pkgver=3.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc='A fast and versatile file copying tool for remote and local files'
 arch=('x86_64')
 url='https://rsync.samba.org/'
@ -20,31 +20,60 @@ source=("git+https://github.com/WayneD/rsync#tag=${_tag}?signed"
 sha256sums=('SKIP'
            '733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b')

-build() {
-	cd "$srcdir/rsync"
+_backports=(
+  # Fix really silly bug with --relative rules.
+  '464555ea923b32f3504678d05bc7de9205e5c8da'

-	./configure \
-		--prefix=/usr \
-		--disable-debug \
-		--with-included-popt=no \
-		--with-included-zlib=no
-	make
+  # Fix bug with validing remote filter rules.
+  '950730313de994d191ba2d5be575e97690b355e8'
+)
+
+_reverts=(
+)
+
+prepare() {
+  cd "$srcdir/rsync"
+
+  local _c
+  for _c in "${_backports[@]}"; do
+    if [[ $_c == *..* ]]; then
+      git log --oneline --reverse "${_c}"
+    else
+      git log --oneline -1 "${_c}"
+    fi
+    git cherry-pick -n -m1 "${_c}"
+  done
+  for _c in "${_reverts[@]}"; do
+    git log --oneline -1 "${_c}"
+    git revert -n "${_c}"
+  done
+}
+
+build() {
+  cd "$srcdir/rsync"
+
+  ./configure \
+    --prefix=/usr \
+    --disable-debug \
+    --with-included-popt=no \
+    --with-included-zlib=no
+  make
 }

 check() {
-	cd "$srcdir/rsync"
+  cd "$srcdir/rsync"

-	make test
+  make test
 }

 package() {
-	cd "$srcdir/rsync"
+  cd "$srcdir/rsync"

-	make DESTDIR="$pkgdir" install
-	install -Dm0644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"
-	install -Dm0644 packaging/lsb/rsync.xinetd "$pkgdir/etc/xinetd.d/rsync"
-	install -Dm0644 packaging/systemd/rsync.service "$pkgdir/usr/lib/systemd/system/rsyncd.service"
-	install -Dm0644 packaging/systemd/rsync.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket"
-	install -Dm0644 packaging/systemd/rsync@.service "$pkgdir/usr/lib/systemd/system/rsyncd@.service"
-	install -Dm0755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync"
+  make DESTDIR="$pkgdir" install
+  install -Dm0644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"
+  install -Dm0644 packaging/lsb/rsync.xinetd "$pkgdir/etc/xinetd.d/rsync"
+  install -Dm0644 packaging/systemd/rsync.service "$pkgdir/usr/lib/systemd/system/rsyncd.service"
+  install -Dm0644 packaging/systemd/rsync.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket"
+  install -Dm0644 packaging/systemd/rsync@.service "$pkgdir/usr/lib/systemd/system/rsyncd@.service"
+  install -Dm0755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync"
 }
				`@ -0,0 +1 @@`
				`python2 and utilities was removed from Arch, so this doesn't build anymore, try mat2`