diff --git a/ddcutil/PKGBUILD b/ddcutil/PKGBUILD new file mode 100644 index 0000000..d7eeb96 --- /dev/null +++ b/ddcutil/PKGBUILD @@ -0,0 +1,44 @@ +#!/usr/bin/bash +# JOBoRun : Jwm OpenBox Obarun RUNit +# Maintainer : Joe Bo Run +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu +#-----------------------------------------| DESCRIPTION |--------------------------------------- + +pkgname=ddcutil +pkgver=1.4.0 +pkgrel=01 +pkgdesc='Query and change Linux monitor settings using DDC/CI and USB. w/o systemd' +url='http://ddcutil.com/' +depends=('glib2' 'i2c-tools' 'libusb' 'libdrm' 'libxrandr') +#makedepends=('systemd') +source=(https://github.com/rockowitz/ddcutil/archive/v$pkgver/$pkgname-$pkgver.tar.gz) + +prepare() { + cd $pkgname-$pkgver + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) + +license=('GPL2') + +sha512sums=('c0486c1bf8469bf55611c4e6ca31f8a8960ae9a93d8cca55979f03d5f95918b6e77c30fdcb2a291dd28c9d3cf0e8679f5bbb614b4f3c57fc3655294163c7aa00') + +sha256sums=(93c23adbd0392c2de2f4beb485fb8deaf1b5e54a551cef7c32d89dbe0f8986c4) # ddcutil-1.4.0.tar.gz + +## 6a2e6abde1df84de2ca2c0d0e67be8bbe4985cf0904648dd0f03536cd5257c02 ddcutil-1.4.0-01-x86_64.pkg.tar.lz + diff --git a/ddcutil/PKGBUILD-arch b/ddcutil/PKGBUILD-arch new file mode 100644 index 0000000..3f6f77a --- /dev/null +++ b/ddcutil/PKGBUILD-arch @@ -0,0 +1,32 @@ +# Maintainer: Felix Yan +# Contributor: Deon Spengler + +pkgname=ddcutil +pkgver=1.4.0 +pkgrel=1 +pkgdesc='Query and change Linux monitor settings using DDC/CI and USB.' +url='http://ddcutil.com/' +arch=('x86_64') +license=('GPL2') +depends=('glib2' 'i2c-tools' 'libusb' 'libdrm' 'libxrandr') +makedepends=('systemd') +source=(https://github.com/rockowitz/ddcutil/archive/v$pkgver/$pkgname-$pkgver.tar.gz) +sha512sums=('c0486c1bf8469bf55611c4e6ca31f8a8960ae9a93d8cca55979f03d5f95918b6e77c30fdcb2a291dd28c9d3cf0e8679f5bbb614b4f3c57fc3655294163c7aa00') + +prepare() { + cd $pkgname-$pkgver + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim: ft=sh ts=2 sw=2 et diff --git a/ddcutil/clean b/ddcutil/clean new file mode 100644 index 0000000..a647718 --- /dev/null +++ b/ddcutil/clean @@ -0,0 +1 @@ +rm -rf {src,pkg,ddcutil*.tar.gz} diff --git a/ddcutil/deps b/ddcutil/deps new file mode 100644 index 0000000..8122dd4 --- /dev/null +++ b/ddcutil/deps @@ -0,0 +1,8 @@ +i2c-tools +libusb +libdrm +libxrandr +autoconf +automake + + diff --git a/ddcutil/time b/ddcutil/time new file mode 100644 index 0000000..f3f4570 --- /dev/null +++ b/ddcutil/time @@ -0,0 +1,6 @@ + + +real 0m43.491s +user 0m39.396s +sys 0m4.481s + diff --git a/gtk2/PKGBUILD b/gtk2/PKGBUILD index 88f1f60..6c6c7b3 100644 --- a/gtk2/PKGBUILD +++ b/gtk2/PKGBUILD @@ -7,9 +7,9 @@ pkgname=gtk2 pkgver=2.24.33 -pkgrel=02 +pkgrel=03 pkgdesc="GObject-based multi-platform GUI toolkit (legacy)" -arch=(x86_64) + url="https://www.gtk.org/" depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage shared-mime-info cairo libcups gtk-update-icon-cache librsvg desktop-file-utils) @@ -27,7 +27,8 @@ source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" pkgver() { cd gtk - git describe --tags | sed 's/-/+/g' +# git describe --tags | sed 's/-/+/g' + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' } prepare() { @@ -48,7 +49,6 @@ build() { # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make } @@ -59,11 +59,14 @@ package() { install -Dt "$pkgdir/usr/share/gtk-2.0" -m644 ../gtkrc install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../gtk-query-immodules-2.0.hook + # Built by GTK 4, shared with GTK 2/3 rm "$pkgdir/usr/bin/gtk-update-icon-cache" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(LGPL) @@ -71,3 +74,5 @@ sha256sums=(SKIP bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805 # gtkrc 427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425 # gtk-query-immodules-2.0.hook 7724a55c4916318ed81b22f21c37c0a66e78adce017563fed6d84d813a4b80bc) # xid-collision-debug.patch + +## 71307c283fe0de18a1235da46503ac70d4dfab154ea698570325c29f5eb3033e gtk2-2.24.33-03-x86_64.pkg.tar.lz diff --git a/gtk2/PKGBUILD-arch b/gtk2/PKGBUILD-arch index 4c063e9..44c11d2 100644 --- a/gtk2/PKGBUILD-arch +++ b/gtk2/PKGBUILD-arch @@ -3,32 +3,57 @@ pkgname=gtk2 pkgver=2.24.33 -pkgrel=2 +pkgrel=3 pkgdesc="GObject-based multi-platform GUI toolkit (legacy)" -arch=(x86_64) url="https://www.gtk.org/" -depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage - shared-mime-info cairo libcups gtk-update-icon-cache librsvg desktop-file-utils) -makedepends=(gobject-introspection git gtk-doc) -optdepends=('gnome-themes-standard: Default widget theme' - 'adwaita-icon-theme: Default icon theme' - 'python: gtk-builder-convert') -provides=(libgailutil.so libg{d,t}k-x11-2.0.so) +arch=(x86_64) +depends=( + atk + cairo + desktop-file-utils + gtk-update-icon-cache + libcups + librsvg + libxcomposite + libxcursor + libxdamage + libxi + libxinerama + libxrandr + pango + shared-mime-info +) +makedepends=( + git + gobject-introspection + gtk-doc +) +optdepends=( + 'adwaita-icon-theme: Default icon theme' + 'gnome-themes-standard: Default widget theme' + 'python: gtk-builder-convert' +) +provides=( + libgailutil.so + libg{d,t}k-x11-2.0.so +) license=(LGPL) install=gtk2.install _commit=68631945733158f164427db84f01301d7e875763 # tags/2.24.33^0 -source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" - gtkrc - gtk-query-immodules-2.0.hook - xid-collision-debug.patch) -sha256sums=('SKIP' - 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805' - '427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425' - '7724a55c4916318ed81b22f21c37c0a66e78adce017563fed6d84d813a4b80bc') +source=( + "git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" + gtkrc + gtk-query-immodules-2.0.hook + xid-collision-debug.patch +) +b2sums=('SKIP' + '0583436972edcebb09ce6c3f445f6ea4d7f92132da0ef317ee93665b646061ba261281b0186ed6655e63bbb668c58e37f6987919d4c054ccda19ca034aa718dc' + '9c531f9f605e1739e13c39c1cac22daddd9574f3082f18bcf0b9dfaa4c41f2485d55be03a9ed12fb4504d509f0d5ac63980a9d9349e3f80a06595c6430c78096' + 'c35b2f16ea3402f41a7a5ac83a93b423e46f9355e11186742402887ba94fc58e9a5c1d7fc55141fab72f230a973c5ac6346090b225a5eff9e416e397bd1b1ec4') pkgver() { cd gtk - git describe --tags | sed 's/-/+/g' + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' } prepare() { @@ -38,18 +63,17 @@ prepare() { } build() { - cd gtk - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xinput=yes \ + local configure_options=( + --prefix=/usr + --sysconfdir=/etc + --localstatedir=/var + --with-xinput=yes --disable-gtk-doc + ) - # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + cd gtk + ./configure "${configure_options[@]}" sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make } @@ -60,7 +84,8 @@ package() { install -Dt "$pkgdir/usr/share/gtk-2.0" -m644 ../gtkrc install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../gtk-query-immodules-2.0.hook + # Built by GTK 4, shared with GTK 2/3 rm "$pkgdir/usr/bin/gtk-update-icon-cache" } -# vim:set et sw=2: +# vim:set sw=2 sts=-1 et: diff --git a/gtk2/deps b/gtk2/deps index 9148b04..53a793d 100644 --- a/gtk2/deps +++ b/gtk2/deps @@ -1,4 +1,4 @@ -atk +at-spi2-core pango libxcursor libxinerama @@ -15,6 +15,7 @@ desktop-file-utils gobject-introspection git gtk-doc - automake autoconf + + diff --git a/libcamera/PKGBUILD b/libcamera/PKGBUILD index 698d9cb..01ca5e8 100644 --- a/libcamera/PKGBUILD +++ b/libcamera/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=libcamera pkgname=(libcamera libcamera-ipa libcamera-tools gst-plugin-libcamera) # libcamera-docs pkgver=0.0.4 _commit=6a57d964abdb3f24608c0fc2839d96e02eebddeb # refs/tags/v0.0.4 -pkgrel=03 +pkgrel=04 pkgdesc="A complex camera support library for Linux, Android, and ChromeOS w/o systemd" url="https://libcamera.org/" depends=(glibc) @@ -30,8 +30,12 @@ _pick() { prepare() { cd $pkgname + # add version, so that utils/gen-version.sh may rely on it printf "%s\n" "$pkgver" > .tarball-version + + # Fix exponential callback explosion + git cherry-pick -n a146e05125fdac75b8ffb6a818e00a446cec65dd } build() { @@ -147,8 +151,8 @@ license=(LGPL2.1 GPL2) sha256sums=(SKIP) -## 7f813a67114abe5f4d123631f082fe4abd556d1b04f9b5b3a93adc4a862d83e3 gst-plugin-libcamera-0.0.4-03-x86_64.pkg.tar.lz -## ca819de94f4d058233e8bb45406cd414d19309dbd6f658fdbbf188b5ffea75ca libcamera-0.0.4-03-x86_64.pkg.tar.lz -## 62f2c572bba02c0f1ec65eb3d507cc63039e37e42ecd04f3ccc50fbaddb8d929 libcamera-ipa-0.0.4-03-x86_64.pkg.tar.lz -## 7518080576f806926a7c65b88099b2bf15c75d7a92079d82bd396b79efd3c016 libcamera-tools-0.0.4-03-x86_64.pkg.tar.lz +## fb6adde2f2aea10e09b3e8a3cb88b36d975792d44e97bbd2aa89e77084970db8 gst-plugin-libcamera-0.0.4-04-x86_64.pkg.tar.lz +## f8dfc738810054bd1a76a0b1364a62d1b5c79c373acaf5d4757c47801f02dea1 libcamera-0.0.4-04-x86_64.pkg.tar.lz +## bd9daf7d306d2879950882926bc0f5b1b4e70e9f1ea38319cff4148bbdbb94f5 libcamera-ipa-0.0.4-04-x86_64.pkg.tar.lz +## 220f61b09ea1f954b78d2dfe9c4c3818dd17d30a34fa87cf0bb8656a89d9e5a5 libcamera-tools-0.0.4-04-x86_64.pkg.tar.lz diff --git a/libcamera/PKGBUILD-arch b/libcamera/PKGBUILD-arch index 734d448..79af414 100644 --- a/libcamera/PKGBUILD-arch +++ b/libcamera/PKGBUILD-arch @@ -10,7 +10,7 @@ pkgname=( ) pkgver=0.0.4 _commit=6a57d964abdb3f24608c0fc2839d96e02eebddeb # refs/tags/v0.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="A complex camera support library for Linux, Android, and ChromeOS" arch=(x86_64) url="https://libcamera.org/" @@ -53,8 +53,12 @@ _pick() { prepare() { cd $pkgname + # add version, so that utils/gen-version.sh may rely on it printf "%s\n" "$pkgver" > .tarball-version + + # Fix exponential callback explosion + git cherry-pick -n a146e05125fdac75b8ffb6a818e00a446cec65dd } build() { diff --git a/libcamera/deps b/libcamera/deps index c855e7b..6ffc49f 100644 --- a/libcamera/deps +++ b/libcamera/deps @@ -18,4 +18,3 @@ sdl2 texlive-core libgit2 - diff --git a/libgit2/PKGBUILD b/libgit2/PKGBUILD index 7923525..76c1e60 100644 --- a/libgit2/PKGBUILD +++ b/libgit2/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libgit2 -pkgver=1.6.3 +pkgver=1.6.4 pkgrel=01 epoch=1 pkgdesc="A linkable library for Git" @@ -77,11 +77,8 @@ arch=(x86_64) license=(GPL2) +sha512sums=('fd73df91710f19b0d6c3765c37c7f529233196da91cf4d58028a8d3840244f11df44abafabd74a8ed1cbe4826d1afd6ff9f01316d183ace0924c65e7cf0eb8d5') -sha512sums=('5a390030395d5e00217ca3229ff1374f064b41c7c14c332618778af7067c378bca5ffee5c072ad144a71126f7e8cfcd770746b6af8eccf086c8a8b8afa1733f1') -b2sums=('c0a588e962c182c09b91e257760484bc0ebf2ab07fdd89b7b90db1dd6749d7fb65b8e3fcd20e8a46a6381038aeac8759161dc409be36eadc776a55d74290e59c') - -sha256sums=(a8e2a09835eabb24ace2fd597a78af182e1e199a894e99a90e4c87c849fcd9c4) # libgit2-v1.6.3.tar.gz - -## b30be1500cdf171ad95a2165098a47038ffabbecf2d57344d0ae392f02cfc4f8 libgit2-1:1.6.3-01-x86_64.pkg.tar.lz +sha256sums=(d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d) # libgit2-v1.6.4.tar.gz +## d38f531f4b24b689819016c5a7cb993674dd0cc1d41b197fea0ee7d4dc413afd libgit2-1:1.6.4-01-x86_64.pkg.tar.lz diff --git a/libgit2/PKGBUILD-arch b/libgit2/PKGBUILD-arch index 659b5da..06de7fa 100644 --- a/libgit2/PKGBUILD-arch +++ b/libgit2/PKGBUILD-arch @@ -4,7 +4,7 @@ # Contributor: Dave Reisner pkgname=libgit2 -pkgver=1.6.3 +pkgver=1.6.4 pkgrel=1 epoch=1 pkgdesc="A linkable library for Git" @@ -26,8 +26,8 @@ makedepends=( ) provides=(libgit2.so) source=($url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz) -sha512sums=('5a390030395d5e00217ca3229ff1374f064b41c7c14c332618778af7067c378bca5ffee5c072ad144a71126f7e8cfcd770746b6af8eccf086c8a8b8afa1733f1') -b2sums=('c0a588e962c182c09b91e257760484bc0ebf2ab07fdd89b7b90db1dd6749d7fb65b8e3fcd20e8a46a6381038aeac8759161dc409be36eadc776a55d74290e59c') +sha512sums=('fd73df91710f19b0d6c3765c37c7f529233196da91cf4d58028a8d3840244f11df44abafabd74a8ed1cbe4826d1afd6ff9f01316d183ace0924c65e7cf0eb8d5') +b2sums=('103af9ea9ed1310b1066a48859bbefc162647d787519bb3df83d7ea1957cda5934537271970d3d180f91daa6edc3bbc05387d6293812f0d849dda966419d29ba') build() { local cmake_options=( diff --git a/mercurial/PKGBUILD b/mercurial/PKGBUILD index a5e3a33..b282b78 100644 --- a/mercurial/PKGBUILD +++ b/mercurial/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=mercurial -pkgver=6.4 +pkgver=6.4.1 pkgrel=01 pkgdesc='A scalable distributed SCM tool' url="https://www.mercurial-scm.org/" @@ -83,8 +83,9 @@ validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5 # 818D87CD1AC180C394C86E633A33DE460D9EC39F # Pulkit Goyal <7895pulkit@gmail.com> 1F66F8CDF654E905C11DA061A11E01CD0E05D956) # Raphaël Gomès -sha256sums=(e88bfbcb9911e76904a31b972e57f86da8e6ce5892b98c39dd51d3b9599c1347 # mercurial-6.4.tar.gz - 95c176c6fd53d94a0a360a23b3fb263484192eaffeb7938bcb92a81e35415be8 # mercurial-6.4.tar.gz.asc +sha256sums=(05b059a0cc7f4e72619be573e7acae9d4d79614d47203d2078d2170ac047f0ae # mercurial-6.4.1.tar.gz + 717ab1e2571b242856483bad830ef545027711bf134f0e934db0d8b498dc1a54 # mercurial-6.4.1.tar.gz.asc 87427151713e689cd87dc50d50c048e0e58285815e4eb61962b50583532cbde5) # mercurial.profile -## 8e384c82b09f4ed808a0b304208766464782357c3dca4efdb6600e7a9520a775 mercurial-6.4-01-x86_64.pkg.tar.lz +## 1838f9a6576f018713a7b198e3de37668ce7303a448a8a016387c41ff4d98980 mercurial-6.4.1-01-x86_64.pkg.tar.lz + diff --git a/mercurial/PKGBUILD-arch b/mercurial/PKGBUILD-arch index 7c1cc8a..83b9675 100644 --- a/mercurial/PKGBUILD-arch +++ b/mercurial/PKGBUILD-arch @@ -1,74 +1,319 @@ -# Maintainer: Bartłomiej Piotrowski -# Contributor: Giovanni Scafora -# Contributor: Douglas Soares de Andrade +# Maintainer : Christian Hesse +# Maintainer : Ronald van Haren +# Contributor: Tobias Powalowski +# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -pkgname=mercurial -pkgver=6.4 +## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable +_IA32_EFI_IN_ARCH_X64="1" + +## "1" to enable EMU build, "0" to disable +_GRUB_EMU_BUILD="0" + +[[ "${CARCH}" == 'x86_64' ]] && _EFI_ARCH='x86_64' +[[ "${CARCH}" == 'i686' ]] && _EFI_ARCH='i386' + +[[ "${CARCH}" == 'x86_64' ]] && _EMU_ARCH='x86_64' +[[ "${CARCH}" == 'i686' ]] && _EMU_ARCH='i386' + +pkgname='grub' +pkgdesc='GNU GRand Unified Bootloader (2)' +epoch=2 +_commit='e67a551a48192a04ab705fca832d82f850162b64' +_pkgver=2.06.r499.ge67a551a4 +_unifont_ver='15.0.01' +pkgver=${_pkgver/-/} pkgrel=1 -pkgdesc='A scalable distributed SCM tool' -arch=(x86_64) -url="https://www.mercurial-scm.org/" -license=(GPL) -depends=(python) -makedepends=(python-docutils) -optdepends=('tk: for the hgk GUI') -#checkdepends=('breezy' 'cvs' 'git' 'git-lfs' 'python-docutils' 'subversion' 'unzip') +url='https://www.gnu.org/software/grub/' +arch=('x86_64') +license=('GPL3') +backup=('etc/default/grub' + 'etc/grub.d/40_custom') +install="${pkgname}.install" +options=('!makeflags') -# ToDo: -# check included contrib/packaging/mercurial.spec and how BLFS/Gentoo/Debian/Fedora do it -# the following should be either makedepends or checkdepends when running tests -# 'python-gnupg' 'python-pygments' 'python-pyflakes' 'python-pyopenssl' -# 'openssh' 'rust' 'subversion' 'breezy' 'cvs' 'git') +conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy') +replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") +provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") -backup=(etc/mercurial/hgrc) -validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5 - EB851395B4223EE2F7BA0B28DA54740BF08732BA - 818D87CD1AC180C394C86E633A33DE460D9EC39F # Pulkit Goyal <7895pulkit@gmail.com> - 1F66F8CDF654E905C11DA061A11E01CD0E05D956) # Raphaël Gomès -source=(https://www.mercurial-scm.org/release/${pkgname}-${pkgver}.tar.gz{,.asc} - mercurial.profile) -sha512sums=('a7810eddd0fd2a331215a5f7e9c81df4d860cf695aec3c5e3984821827b5427b5a01b68c07b9711e86db2f9b0ef5b5d3d6251a7dc76f99375c457920ce36c96f' +makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2') +depends=('sh' 'xz' 'gettext' 'device-mapper') +optdepends=('freetype2: For grub-mkfont usage' + 'fuse2: For grub-mount usage' + 'dosfstools: For grub-mkrescue FAT FS and EFI support' + 'lzop: For grub-mkrescue LZO support' + 'efibootmgr: For grub-install EFI support' + 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' + 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' + 'mtools: For grub-mkrescue FAT FS support') + +if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + makedepends+=('libusbx' 'sdl') + optdepends+=('libusbx: For grub-emu USB support' + 'sdl: For grub-emu SDL support') +fi + +validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko + 'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper + '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy + +source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}" + 'git+https://git.savannah.gnu.org/git/gnulib.git' + "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig} + '0001-00_header-add-GRUB_COLOR_-variables.patch' + '0002-10_linux-detect-archlinux-initramfs.patch' + 'grub.default' + 'sbat.csv') + +sha256sums=('SKIP' 'SKIP' - '710dcddb24d928efc97370e869d9caa083107929ed9a1086dd2a3ae0caaf2c71e2f29060597e29315b6b15b1616251c42412e268ce737109c48ae4d7aa1b9555') + '1fddba900a36b8a067bf2177b05c4a2482a0f7ca1545cf531c03509f47ce1590' + 'SKIP' + '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab' + '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d' + '7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb' + '98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df') -build() { - cd $pkgname-$pkgver - python setup.py build - make -C contrib/chg +_backports=( +) + +_reverts=( +) + +_configure_options=( + PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}" + FREETYPE="pkg-config freetype2" + BUILD_FREETYPE="pkg-config freetype2" + --enable-nls + --enable-device-mapper + --enable-cache-stats + --enable-grub-mkfont + --enable-grub-mount + --prefix="/usr" + --bindir="/usr/bin" + --sbindir="/usr/bin" + --mandir="/usr/share/man" + --infodir="/usr/share/info" + --datarootdir="/usr/share" + --sysconfdir="/etc" + --program-prefix="" + --with-bootdir="/boot" + --with-grubdir="grub" + --disable-silent-rules + --disable-werror +) + +prepare() { + cd "${srcdir}/grub/" + + echo "Apply backports..." + local _c + for _c in "${_backports[@]}"; do + git log --oneline -1 "${_c}" + git cherry-pick -n "${_c}" + done + + echo "Apply reverts..." + local _c + for _c in "${_reverts[@]}"; do + git log --oneline -1 "${_c}" + git revert -n "${_c}" + done + + echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..." + ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html + patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" + + echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..." + patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch" + + echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..." + sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac" + + echo "Fix mkinitcpio 'rw' FS#36275..." + sed 's| ro | rw |g' -i "util/grub.d/10_linux.in" + + echo "Fix OS naming FS#33393..." + sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in" + + echo "Pull in latest language files..." + ./linguas.sh + + echo "Avoid problem with unifont during compile of grub..." + # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847 + gzip -cd "${srcdir}/unifont-${_unifont_ver}.bdf.gz" > "unifont.bdf" + + echo "Run bootstrap..." + ./bootstrap \ + --gnulib-srcdir="${srcdir}/gnulib/" \ + --no-git + + echo "Make translations reproducible..." + sed -i '1i /^PO-Revision-Date:/ d' po/*.sed } -check() { - cd $pkgname-$pkgver/tests - # TODO - disabled for now - to many tests fail - #python run-tests.py # -j48 || : +_build_grub-common_and_bios() { + echo "Set ARCH dependent variables for bios build..." + if [[ "${CARCH}" == 'x86_64' ]]; then + _EFIEMU="--enable-efiemu" + else + _EFIEMU="--disable-efiemu" + fi + + echo "Copy the source for building the bios part..." + cp -r "${srcdir}/grub/" "${srcdir}/grub-bios/" + cd "${srcdir}/grub-bios/" + + echo "Unset all compiler FLAGS for bios build..." + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + echo "Run ./configure for bios build..." + ./configure \ + --with-platform="pc" \ + --target="i386" \ + "${_EFIEMU}" \ + --enable-boot-time \ + "${_configure_options[@]}" + + if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then + echo "Make info pages reproducible..." + touch -d "@${SOURCE_DATE_EPOCH}" $(find -name '*.texi') + fi + + echo "Run make for bios build..." + make +} + +_build_grub-efi() { + echo "Copy the source for building the ${_EFI_ARCH} efi part..." + cp -r "${srcdir}/grub/" "${srcdir}/grub-efi-${_EFI_ARCH}/" + cd "${srcdir}/grub-efi-${_EFI_ARCH}/" + + echo "Unset all compiler FLAGS for ${_EFI_ARCH} efi build..." + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + echo "Run ./configure for ${_EFI_ARCH} efi build..." + ./configure \ + --with-platform="efi" \ + --target="${_EFI_ARCH}" \ + --disable-efiemu \ + --enable-boot-time \ + "${_configure_options[@]}" + + echo "Run make for ${_EFI_ARCH} efi build..." + make +} + +_build_grub-emu() { + echo "Copy the source for building the emu part..." + cp -r "${srcdir}/grub/" "${srcdir}/grub-emu/" + cd "${srcdir}/grub-emu/" + + echo "Unset all compiler FLAGS for emu build..." + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + echo "Run ./configure for emu build..." + ./configure \ + --with-platform="emu" \ + --target="${_EMU_ARCH}" \ + --enable-grub-emu-usb=no \ + --enable-grub-emu-sdl=no \ + --disable-grub-emu-pci \ + "${_configure_options[@]}" + + echo "Run make for emu build..." + make +} + +build() { + cd "${srcdir}/grub/" + + echo "Build grub bios stuff..." + _build_grub-common_and_bios + + echo "Build grub ${_EFI_ARCH} efi stuff..." + _build_grub-efi + + if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then + echo "Build grub i386 efi stuff..." + _EFI_ARCH="i386" _build_grub-efi + fi + + if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + echo "Build grub emu stuff..." + _build_grub-emu + fi +} + +_package_grub-common_and_bios() { + cd "${srcdir}/grub-bios/" + + echo "Run make install for bios build..." + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install + + echo "Remove gdb debugging related files for bios build..." + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true + + echo "Install /etc/default/grub (used by grub-mkconfig)..." + install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" +} + +_package_grub-efi() { + cd "${srcdir}/grub-efi-${_EFI_ARCH}/" + + echo "Run make install for ${_EFI_ARCH} efi build..." + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install + + echo "Remove gdb debugging related files for ${_EFI_ARCH} efi build..." + rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true + + sed -e "s/%PKGVER%/${epoch}:${pkgver}-${pkgrel}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv" +} + +_package_grub-emu() { + cd "${srcdir}/grub-emu/" + + echo "Run make install for emu build..." + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install + + echo "Remove gdb debugging related files for emu build..." + rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true } package() { - cd $pkgname-$pkgver - python setup.py install --root="$pkgdir" --skip-build --optimize=1 - make DESTDIR="${pkgdir}" PREFIX=/usr install + cd "${srcdir}/grub/" - install -m644 -D contrib/zsh_completion "$pkgdir/usr/share/zsh/site-functions/_hg" - install -m644 -D contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/hg" + echo "Package grub ${_EFI_ARCH} efi stuff..." + _package_grub-efi - make -C contrib/chg DESTDIR="$pkgdir" PREFIX=/usr install - install -m755 contrib/hg-ssh "$pkgdir/usr/bin" - install -m755 contrib/hgk "$pkgdir/usr/bin" + if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then + echo "Package grub i386 efi stuff..." + _EFI_ARCH="i386" _package_grub-efi + fi - install -d "$pkgdir/usr/share/emacs/site-lisp" - install -m644 contrib/{mq.el,mercurial.el} "$pkgdir/usr/share/emacs/site-lisp" + if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + echo "Package grub emu stuff..." + _package_grub-emu + fi - install -Dm644 contrib/vim/HGAnnotate.vim \ - "$pkgdir/usr/share/vim/vimfiles/syntax/HGAnnotate.vim" - - # set some variables - install -m755 -d "$pkgdir/etc/profile.d" - install -m644 "$srcdir/mercurial.profile" "$pkgdir/etc/profile.d/mercurial.sh" - - # FS#38825 - Add certs config to package - install -m755 -d "$pkgdir/etc/mercurial" - cat <<-EOF > "$pkgdir/etc/mercurial/hgrc" - [web] - cacerts = /etc/ssl/certs/ca-certificates.crt - EOF + echo "Package grub bios stuff..." + _package_grub-common_and_bios } diff --git a/mercurial/deps b/mercurial/deps index d4affd0..61bdc95 100644 --- a/mercurial/deps +++ b/mercurial/deps @@ -1,3 +1,2 @@ python-docutils - diff --git a/obs-studio/PKGBUILD b/obs-studio/PKGBUILD index 8d39b20..4ceb9a5 100644 --- a/obs-studio/PKGBUILD +++ b/obs-studio/PKGBUILD @@ -6,8 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=obs-studio -pkgver=29.1.beta2 -#pkgver=29.0.2 +pkgver=29.0.2 #pkgver=29.0.0124+ga0b5c1b3f #pkgver=${_pkgver//-/_} pkgrel=02 @@ -37,9 +36,8 @@ optdepends=("libfdk-aac: FDK AAC codec support" "jack2: The JACK low-latency audio server") provides=("obs-studio=$pkgver") conflicts=("obs-studio-git") -##_commit=8d9fc74631bb8d0f7ca71d2c158f922b702e7750 # tags/29.0.2 -##source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#commit=$_commit" -source=("$pkgname::https://github.com/obsproject/obs-studio/releases/download/29.1.0-beta2/OBS-Studio-29.1-beta2.zip" +_commit=8d9fc74631bb8d0f7ca71d2c158f922b702e7750 # tags/29.0.2 +source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#commit=$_commit" #source=("$pkgname::git+https://github.com/obsproject/obs-studio.git" # "git+https://github.com/Mixer/ftl-sdk.git" # "git+https://github.com/obsproject/obs-browser.git" @@ -64,7 +62,7 @@ source=("$pkgname::https://github.com/obsproject/obs-studio/releases/download/29 prepare() { # gitconf="protocol.file.allow=always" - cd $pkgname-$pkgver + cd $pkgname patch -Np1 < "$srcdir"/fix_python_binary_loading.patch patch -Np1 < "$srcdir"/ignore_unused_submodules.patch @@ -83,7 +81,7 @@ prepare() { } build() { - cmake -B build -S $pkgname-$pkgver \ + cmake -B build -S $pkgname \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DENABLE_BROWSER=OFF \ -DENABLE_VST=ON \ @@ -112,8 +110,6 @@ build() { } package() { - cd $pkgname-$pkgver - # cd $pkgname/build # # make install DESTDIR="$pkgdir" diff --git a/obs-studio/obs-studio-rc/PKGBUILD b/obs-studio/obs-studio-rc/PKGBUILD deleted file mode 100644 index b116613..0000000 --- a/obs-studio/obs-studio-rc/PKGBUILD +++ /dev/null @@ -1,144 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/$pkgname" -# Website : https://pozol.eu -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgname=obs-studio-rc -_pkgver=29.1.0-beta2 -pkgver=${_pkgver//-/_} -pkgrel=1 -#epoch=5 -pkgdesc="Beta cycle of the free and open source software for video recording and live streaming. With everything except service integration" -url="https://github.com/obsproject/obs-studio" -# To manage dependency rebuild easily, this will prevent you to rebuild OBS on non-updated system -_mbedtlsver=2.28 -_pythonver=3.10 -depends=( - "jack" "gtk-update-icon-cache" "x264" "rnnoise" "pciutils" "qt6-svg" - "mbedtls>=$_mbedtlsver" - - # "libxinerama" provided by "vlc-luajit" - # "libxkbcommon-x11" provided by "qt6-base" - # "jansson" "curl" provided by "ftl-sdk" - - # Needed to use Qt on Wayland platform - "qt6-wayland" - - # Both needed to load linux-capture, so those two are no longer optional - "libxcomposite" "pipewire" - - # Needed to use PipeWire capture - "xdg-desktop-portal" - - # Needed by obs-browser -# "libxss" "libxrandr" "nss" "at-spi2-core" - - # AUR Packages - "ffmpeg-obs>=6" "vlc-luajit" "ftl-sdk" -) -## About vlc-luajit -# The official VLC package will make OBS crash when a VLC source is used. -# The issue is that VLC and OBS are compiled with different lua version. -# So I also created vlc-luajit, a VLC package compiled with the same lua as OBS. -# But to make people unable to install VLC official package with obs-studio-tytan652. -# I decided to make vlc-luajit a dependency of OBS rather than an optional one. -## About ffmpeg-obs -# Read ffmpeg-obs PKGBUILD for more info -makedepends=( - "cmake" "git" "libfdk-aac" "swig" "luajit" "sndio" - "python>=$_pythonver" - - # Needed by obs-websocket - 'asio' 'nlohmann-json' 'websocketpp' - - # AUR Packages - "libajantv2" -# needed when --browser is enabled -# "cef-minimal-obs=103.0.0_5060_shared_textures_143.2591+g4204d54+chromium_103.0.5060.134_1" -) - -optdepends=( - "libfdk-aac: FDK AAC codec support" - "intel-media-driver: Hardware encoding (>= Broadwell)" - "libva-intel-driver: Hardware encoding (<= Haswell)" - "libva-mesa-driver: Hardware encoding" - "swig: Scripting" - "luajit: Lua scripting" - "python>=$_pythonver: Python scripting" - "sndio: Sndio input client" - "v4l2loopback-dkms: Virtual camera output" - "libajantv2: AJA NTV 2 support" -) -provides=("obs-studio=$pkgver" "obs-vst" "obs-websocket") -conflicts=( - "obs-studio" "obs-vst" "obs-websocket" - "obs-linuxbrowser" # This plugin is obsolete - "libva-vdpau-driver" # This driver is abandonned and make OBS segfault if it happen to be loaded, try libva-nvidia-driver is you really need Nvidia decode through VAAPI -) # "obs-browser" -options=('debug') -source=( - "obs-studio::git+https://github.com/obsproject/obs-studio.git#tag=$_pkgver" - "obs-browser::git+https://github.com/obsproject/obs-browser.git" - "obs-websocket::git+https://github.com/obsproject/obs-websocket.git" - "qr::git+https://github.com/nayuki/QR-Code-generator.git" -) - - - -if [[ $CARCH == 'x86_64' ]]; then - optdepends+=("decklink: Blackmagic Design DeckLink support") -fi - -prepare() { - cd "$srcdir/obs-studio" - git config submodule.plugins/obs-browser.url $srcdir/obs-browser - git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket - git -c protocol.file.allow=always submodule update - - cd plugins/obs-websocket - git config submodule.deps/qr.url $srcdir/qr - git -c protocol.file.allow=always submodule update deps/qr -} - -build() { - cd "$srcdir"/obs-studio - mkdir -p build; cd build - - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DENABLE_RTMPS=ON \ - -DQT_VERSION=6 \ - -DENABLE_LIBFDK=ON \ - -DENABLE_JACK=ON \ - -DENABLE_SNDIO=ON \ - -DENABLE_BROWSER=OFF \ - -DCEF_ROOT_DIR=/opt/cef-obs \ - -DBETA="$_pkgver" .. -# -DOBS_VERSION_OVERRIDE="$_pkgver" .. -# -DRELEASE_CANDIDATE="$_pkgver" .. - - sed -i "s|#define OBS_VERSION |#define OBS_VERSION \"$_pkgver-rc-$pkgrel\" //|" config/obsconfig.h - - make -} - -package() { - cd obs-studio/build - - make install DESTDIR="$pkgdir" -} - -#---- arch license gpg-key & sha256sums ---- - -arch=(x86_64) - -license=("GPL3") - -sha256sums=(a "SKIP" "SKIP" "SKIP" "SKIP") - -## - diff --git a/obs-studio/obs-studio-rc/PKGBUILD-aur b/obs-studio/obs-studio-rc/PKGBUILD-aur deleted file mode 100644 index 44c7756..0000000 --- a/obs-studio/obs-studio-rc/PKGBUILD-aur +++ /dev/null @@ -1,143 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/$pkgname" -# Website : https://pozol.eu -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgname=obs-studio-rc -_pkgver=29.1.0-beta2 -pkgver=${_pkgver//-/_} -pkgrel=1 -#epoch=5 -pkgdesc="Beta cycle of the free and open source software for video recording and live streaming. With everything except service integration" -url="https://github.com/obsproject/obs-studio" -# To manage dependency rebuild easily, this will prevent you to rebuild OBS on non-updated system -_mbedtlsver=2.28 -_pythonver=3.10 -depends=( - "jack" "gtk-update-icon-cache" "x264" "rnnoise" "pciutils" "qt6-svg" - "mbedtls>=$_mbedtlsver" - - # "libxinerama" provided by "vlc-luajit" - # "libxkbcommon-x11" provided by "qt6-base" - # "jansson" "curl" provided by "ftl-sdk" - - # Needed to use Qt on Wayland platform - "qt6-wayland" - - # Both needed to load linux-capture, so those two are no longer optional - "libxcomposite" "pipewire" - - # Needed to use PipeWire capture - "xdg-desktop-portal" - - # Needed by obs-browser - "libxss" "libxrandr" "nss" "at-spi2-core" - - # AUR Packages - "ffmpeg-obs>=6" "vlc-luajit" "ftl-sdk" -) -## About vlc-luajit -# The official VLC package will make OBS crash when a VLC source is used. -# The issue is that VLC and OBS are compiled with different lua version. -# So I also created vlc-luajit, a VLC package compiled with the same lua as OBS. -# But to make people unable to install VLC official package with obs-studio-tytan652. -# I decided to make vlc-luajit a dependency of OBS rather than an optional one. -## About ffmpeg-obs -# Read ffmpeg-obs PKGBUILD for more info -makedepends=( - "cmake" "git" "libfdk-aac" "swig" "luajit" "sndio" - "python>=$_pythonver" - - # Needed by obs-websocket - 'asio' 'nlohmann-json' 'websocketpp' - - # AUR Packages - "libajantv2" - - "cef-minimal-obs=103.0.0_5060_shared_textures_143.2591+g4204d54+chromium_103.0.5060.134_1" -) -optdepends=( - "libfdk-aac: FDK AAC codec support" - "intel-media-driver: Hardware encoding (>= Broadwell)" - "libva-intel-driver: Hardware encoding (<= Haswell)" - "libva-mesa-driver: Hardware encoding" - "swig: Scripting" - "luajit: Lua scripting" - "python>=$_pythonver: Python scripting" - "sndio: Sndio input client" - "v4l2loopback-dkms: Virtual camera output" - "libajantv2: AJA NTV 2 support" -) -provides=("obs-studio=$pkgver" "obs-vst" "obs-websocket") -conflicts=( - "obs-studio" "obs-vst" "obs-websocket" "obs-browser" - "obs-linuxbrowser" # This plugin is obsolete - "libva-vdpau-driver" # This driver is abandonned and make OBS segfault if it happen to be loaded, try libva-nvidia-driver is you really need Nvidia decode through VAAPI -) -options=('debug') -source=( - "obs-studio::git+https://github.com/obsproject/obs-studio.git#tag=$_pkgver" - "obs-browser::git+https://github.com/obsproject/obs-browser.git" - "obs-websocket::git+https://github.com/obsproject/obs-websocket.git" - "qr::git+https://github.com/nayuki/QR-Code-generator.git" -) - - - -if [[ $CARCH == 'x86_64' ]]; then - optdepends+=("decklink: Blackmagic Design DeckLink support") -fi - -prepare() { - cd "$srcdir/obs-studio" - git config submodule.plugins/obs-browser.url $srcdir/obs-browser - git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket - git -c protocol.file.allow=always submodule update - - cd plugins/obs-websocket - git config submodule.deps/qr.url $srcdir/qr - git -c protocol.file.allow=always submodule update deps/qr -} - -build() { - cd "$srcdir"/obs-studio - mkdir -p build; cd build - - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DENABLE_RTMPS=ON \ - -DQT_VERSION=6 \ - -DENABLE_LIBFDK=ON \ - -DENABLE_JACK=ON \ - -DENABLE_SNDIO=ON \ - -DENABLE_BROWSER=ON \ - -DCEF_ROOT_DIR=/opt/cef-obs \ - -DBETA="$_pkgver" .. -# -DOBS_VERSION_OVERRIDE="$_pkgver" .. -# -DRELEASE_CANDIDATE="$_pkgver" .. - - sed -i "s|#define OBS_VERSION |#define OBS_VERSION \"$_pkgver-rc-$pkgrel\" //|" config/obsconfig.h - - make -} - -package() { - cd obs-studio/build - - make install DESTDIR="$pkgdir" -} - -#---- arch license gpg-key & sha256sums ---- - -arch=(x86_64) - -license=("GPL3") - -sha256sums=(a "SKIP" "SKIP" "SKIP" "SKIP") - -## - diff --git a/obs-studio/obs-studio-rc/PKGBUILD-beta2 b/obs-studio/obs-studio-rc/PKGBUILD-beta2 deleted file mode 100644 index d563ad2..0000000 --- a/obs-studio/obs-studio-rc/PKGBUILD-beta2 +++ /dev/null @@ -1,133 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" -# Website : https://pozol.eu -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgname=obs-studio -_pkgver=29.1.0-beta2 -#pkgver=29.0.2 -#pkgver=29.0.0124+ga0b5c1b3f -pkgver=${_pkgver//-/_} -pkgrel=02 -#epoch=5 -pkgdesc="Free and open source software for video recording and live streaming. w/o systemd pipewire pulseaudio" - -url="https://github.com/obsproject/obs-studio" -depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11" "mbedtls" "rnnoise" "pciutils" - "qt5-svg" "curl" "gtk-update-icon-cache" "libxcomposite") -# "speexdsp" "pciutils" "libajantv2" "librist") -makedepends=('cmake' 'libfdk-aac' 'x264' 'swig' 'python' 'luajit' 'sndio') - -#makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" -# "vlc" "swig" "luajit" "python" -# "cef-minimal-obs-bin" #"wayland" -# "qt5-wayland" "xdg-desktop-portal" -#"pipewire" -#) -optdepends=("libfdk-aac: FDK AAC codec support" - "libva-intel-driver: hardware encoding" - "libva-mesa-driver: hardware encoding" - "vlc: VLC Media Source" - "luajit: Lua scripting" - "python: Python scripting" - 'sndio: Sndio input client' - "v4l2loopback-dkms: Virtual webcam" - "jack2: The JACK low-latency audio server") -provides=("obs-studio=$pkgver") -conflicts=("obs-studio-git") -##_commit=8d9fc74631bb8d0f7ca71d2c158f922b702e7750 # tags/29.0.2 -##source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#commit=$_commit" -source=("$pkgname::https://github.com/obsproject/obs-studio/releases/download/29.1.0-beta2/OBS-Studio-29.1-beta2.zip" -#source=("$pkgname::git+https://github.com/obsproject/obs-studio.git" - # "git+https://github.com/Mixer/ftl-sdk.git" - # "git+https://github.com/obsproject/obs-browser.git" - # "git+https://github.com/obsproject/obs-vst.git" - # "git+https://github.com/obsproject/obs-websocket.git" - # "git+https://github.com/chriskohlhoff/asio.git" - # "git+https://github.com/nlohmann/json.git" - # "git+https://github.com/nayuki/QR-Code-generator.git" - # "git+https://github.com/zaphoyd/websocketpp.git" - fix_python_binary_loading.patch - ignore_unused_submodules.patch) - -##pkgver() { -## cd $pkgname -## git describe --long --tags | cut -d- -f1-2 | sed "s/-/\./" -##} -#pkgver() { -# cd $pkgname -# git describe --long | sed "s/$pkgname//" | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;' | sed 's/+//' -#} - -prepare() { -# gitconf="protocol.file.allow=always" - - cd $pkgname-$pkgver - patch -Np1 < "$srcdir"/fix_python_binary_loading.patch - patch -Np1 < "$srcdir"/ignore_unused_submodules.patch - -# git config submodule.plugins/obs-outputs/ftl-sdk.url $srcdir/ftl-sdk -# git config submodule.plugins/obs-browser.url $srcdir/obs-browser -# git config submodule.plugins/obs-vst.url $srcdir/obs-vst -# git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket -# git -c $gitconf submodule update -# -# cd plugins/obs-websocket -# git config submodule.deps/asio.url $srcdir/asio -# git config submodule.deps/json.url $srcdir/json -# git config submodule.deps/qr.url $srcdir/QR-Code-generator -# git config submodule.deps/websocketpp.url $srcdir/websocketpp -# git -c $gitconf submodule update -} - -build() { - cmake -B build -S $pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DENABLE_BROWSER=OFF \ - -DENABLE_VST=ON \ - -DENABLE_VLC=OFF \ - -DENABLE_NEW_MPEGTS_OUTPUT=OFF \ - -DENABLE_AJA=OFF \ - -DENABLE_JACK=ON \ - -DENABLE_ALSA=ON \ - -DENABLE_LIBFDK=ON \ - -DOBS_VERSION_OVERRIDE="$pkgver-$pkgrel" \ - -DENABLE_PIPEWIRE=FALSE \ - -DENABLE_PULSEAUDIO=FALSE \ - -Wno-dev - cmake --build build - - -# mkdir -p build; cd build -# -# cmake \ -# -DCMAKE_INSTALL_PREFIX=/usr \ -# -DCMAKE_INSTALL_LIBDIR=lib \ -# -DBUILD_BROWSER=ON \ -# -DCEF_ROOT_DIR="/opt/cef-obs" \ -# .. -# make -} - -package() { - cd $pkgname-$pkgver - -# cd $pkgname/build -# -# make install DESTDIR="$pkgdir" - - DESTDIR="$pkgdir" cmake --install build -} - -#---- arch license gpg-key & sha256sums ---- - -arch=(x86_64) - -license=("GPL2") - -sha256sums=(SKIP #SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP - bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd # fix_python_binary_loading.patch - 60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3) # ignore_unused_submodules.patch - diff --git a/obs-studio/obs-studio-rc/deps b/obs-studio/obs-studio-rc/deps deleted file mode 100644 index 340145e..0000000 --- a/obs-studio/obs-studio-rc/deps +++ /dev/null @@ -1,24 +0,0 @@ -cmake -git -libfdk-aac -swig -sndio -python -asio -nlohmann-json -websocketpp -libajantv2 - -jack2 -gtk-update-icon-cache -x264 -rnnoise -qt6-svg -mbedtls -qt6-wayland -libxcomposite -pipewire -xdg-desktop-portal -ffmpeg-obs -ftl-sdk - diff --git a/qt6-base/PKGBUILD b/qt6-base/PKGBUILD index 6d26877..d6ea546 100644 --- a/qt6-base/PKGBUILD +++ b/qt6-base/PKGBUILD @@ -6,9 +6,9 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=qt6-base -_qtver=6.4.3 +_qtver=6.5.0 pkgver=${_qtver/-/} -pkgrel=01 +pkgrel=03 url='https://www.qt.io' pkgdesc='A cross-platform application and UI framework' depends=(libjpeg-turbo xcb-util-keysyms xcb-util-cursor libgl fontconfig xdg-utils @@ -50,13 +50,13 @@ build() { -DINSTALL_INCLUDEDIR=include/qt6 \ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \ -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \ - -DQT_FEATURE_journald=OFF \ - -DQT_FEATURE_systemd=OFF \ - -DQT_FEATURE_openssl_linked=ON \ - -DQT_FEATURE_system_sqlite=ON \ - -DQT_FEATURE_system_xcb_xinput=ON \ - -DQT_FEATURE_zstd=OFF \ - -DQT_FEATURE_IPv6_ifname=OFF \ + -DFEATURE_journald=OFF \ + -DFEATURE_systemd=OFF \ + -DFEATURE_openssl_linked=ON \ + -DFEATURE_system_sqlite=ON \ + -DFEATURE_system_xcb_xinput=ON \ + -DFEATURE_zstd=OFF \ + -DFEATURE_IPv6_ifname=OFF \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_MESSAGE_LOG_LEVEL=STATUS @@ -82,10 +82,9 @@ arch=(x86_64) license=(GPL3 LGPL3 FDL custom) -sha256sums=(5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 # qtbase-everywhere-src-6.4.3.tar.xz +sha256sums=(fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef # qtbase-everywhere-src-6.5.0.tar.xz 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qt6-base-cflags.patch 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094) # qt6-base-nostrip.patch -## 88882d6ee635b297739392b68fe084ccbe04b3702f1aa5750a7ab9ad2536f6de qt6-base-6.4.3-01-x86_64.pkg.tar.lz - +## e40b419647b28a890cb25f61ce7383a18ee9146162595a5490cb8cc589ede402 qt6-base-6.5.0-03-x86_64.pkg.tar.lz diff --git a/qt6-base/PKGBUILD-arch b/qt6-base/PKGBUILD-arch index 707834e..12d3265 100644 --- a/qt6-base/PKGBUILD-arch +++ b/qt6-base/PKGBUILD-arch @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino pkgname=qt6-base -_qtver=6.4.3 +_qtver=6.5.0 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=3 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -28,7 +28,7 @@ _pkgfn=${pkgname/6-/}-everywhere-src-$_qtver source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz qt6-base-cflags.patch qt6-base-nostrip.patch) -sha256sums=('5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60' +sha256sums=('fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef' '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') @@ -50,10 +50,11 @@ build() { -DINSTALL_INCLUDEDIR=include/qt6 \ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \ -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \ - -DQT_FEATURE_journald=ON \ - -DQT_FEATURE_openssl_linked=ON \ - -DQT_FEATURE_system_sqlite=ON \ - -DQT_FEATURE_system_xcb_xinput=ON \ + -DFEATURE_journald=ON \ + -DFEATURE_openssl_linked=ON \ + -DFEATURE_system_sqlite=ON \ + -DFEATURE_system_xcb_xinput=ON \ + -DFEATURE_no_direct_extern_access=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_MESSAGE_LOG_LEVEL=STATUS cmake --build build diff --git a/qt6-base/time b/qt6-base/time index 013bcd6..e70ca46 100644 --- a/qt6-base/time +++ b/qt6-base/time @@ -1,6 +1,6 @@ -real 27m21.879s -user 91m27.476s -sys 5m21.654s - +real 25m23.637s +user 90m46.045s +sys 5m44.738s + diff --git a/vte3/PKGBUILD b/vte3/PKGBUILD index 07a2eb8..63f111e 100644 --- a/vte3/PKGBUILD +++ b/vte3/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=vte3 pkgname=(vte-common vte3 vte4) -pkgver=0.72.0 +pkgver=0.72.1 pkgrel=01 pkgdesc="Virtual Terminal Emulator widget w/o systemd" url="https://wiki.gnome.org/Apps/Terminal/VTE" @@ -17,7 +17,7 @@ makedepends=(fribidi gi-docgen git gnutls gobject-introspection gperf gtk3 gtk4 meson pcre2 vala) ## options=(debug !lto) ## uncomment this to have the debug pkg produced options=(!lto) -_commit=164c0f1eb5165786e0addfe5317cf6de3061ddf9 # tags/0.72.0^0 +_commit=e86822b8b7013f96f3b3d2d86839395492cb1470 # tags/0.72.1^0 source=("git+https://gitlab.gnome.org/GNOME/vte.git#commit=$_commit") pkgver() { @@ -118,8 +118,7 @@ license=(LGPL) sha256sums=(SKIP) -## 9a4861d872304908636abb2888cbc7d53305d4072db9e6caff9c7dbe0a3d0ce0 vte3-0.72.0-01-x86_64.pkg.tar.lz -## 1a87790c84ac0c20b7248542dcff44a5ce9875185626086ef3bedd4e4e1cfa10 vte4-0.72.0-01-x86_64.pkg.tar.lz -## 70e7eee8e17981315ab2cf01f543b7a9b6357dce9de2d0b9497eb288520ef60f vte-common-0.72.0-01-x86_64.pkg.tar.lz - +## 55101e59aba39a3dcce5af1a314c14c429971b3736771577cca179738ddca8d1 vte3-0.72.1-01-x86_64.pkg.tar.lz +## 5aa1c8c17ddf2f0ed71cad90022dc6a8aafd2cd356f466cb3955d982b22c3bd3 vte4-0.72.1-01-x86_64.pkg.tar.lz +## 10146b5421cb4337853726d18e1acf1084e731ece01df6a10473f53f5e66740d vte-common-0.72.1-01-x86_64.pkg.tar.lz diff --git a/vte3/PKGBUILD-arch b/vte3/PKGBUILD-arch index 73098dd..1115c90 100644 --- a/vte3/PKGBUILD-arch +++ b/vte3/PKGBUILD-arch @@ -3,7 +3,7 @@ pkgbase=vte3 pkgname=(vte-common vte3 vte4 vte-docs) -pkgver=0.72.0 +pkgver=0.72.1 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget" url="https://wiki.gnome.org/Apps/Terminal/VTE" @@ -24,7 +24,7 @@ makedepends=( vala ) options=(!lto) -_commit=164c0f1eb5165786e0addfe5317cf6de3061ddf9 # tags/0.72.0^0 +_commit=e86822b8b7013f96f3b3d2d86839395492cb1470 # tags/0.72.1^0 source=("git+https://gitlab.gnome.org/GNOME/vte.git#commit=$_commit") sha256sums=('SKIP')