From 39efcecb3652c498ebd2f2d474e43be7e0aeb7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 9 Nov 2022 17:38:40 +0100 Subject: [PATCH] upgpkg: bino 2.0-1 upstream release --- bino/.SRCINFO | 24 +++++++++------------- bino/PKGBUILD | 36 +++++++++++++-------------------- bino/ffmpeg4.4.patch | 48 -------------------------------------------- 3 files changed, 24 insertions(+), 84 deletions(-) delete mode 100644 bino/ffmpeg4.4.patch diff --git a/bino/.SRCINFO b/bino/.SRCINFO index 7f5c885..1d7d948 100644 --- a/bino/.SRCINFO +++ b/bino/.SRCINFO @@ -1,23 +1,19 @@ pkgbase = bino pkgdesc = 3D video player with multi-display support - pkgver = 1.6.8 - pkgrel = 4 + pkgver = 2.0 + pkgrel = 1 url = https://bino3d.org/ arch = x86_64 license = GPL3 - depends = ffmpeg4.4 - depends = freealut - depends = freeglut - depends = glewmx - depends = libass - depends = qt5-base - optdepends = lirc: infrared remote control - source = https://bino3d.org/releases/bino-1.6.8.tar.xz - source = https://bino3d.org/releases/bino-1.6.8.tar.xz.sig - source = ffmpeg4.4.patch + makedepends = cmake + makedepends = qt6-tools + depends = qt6-multimedia + depends = qt6-svg + depends = qvr + source = https://bino3d.org/releases/bino-2.0.tar.gz + source = https://bino3d.org/releases/bino-2.0.tar.gz.sig validpgpkeys = 2F61B4828BBA779AECB3F32703A2A4AB1E32FD34 - sha512sums = d8cf5be356add4ed3fb36673038b5ffd92d0dc840798cc616fa4b11fec221c7f114347dfc7cdb7a3a24c5599b56301cddc99f84d3862d8e874612960281319cc + sha512sums = 5620c506f4de1a9aa7f21f0a23481c5174e7a6a47e6401a84d048dc87843249ef325e33ebc49790d405eb4697c3c571550b0e202f24e758c446ce8e4014f98b3 sha512sums = SKIP - sha512sums = f7bf716a6ae12a4542ecaddeaee1078a6c26d9d765db7cc11a1d7b1ae19b295703f5b05e71564f1aad216485b904d81f2670c122e88ab79c7556f5614c0d1639 pkgname = bino diff --git a/bino/PKGBUILD b/bino/PKGBUILD index 68f4b3c..06423ae 100644 --- a/bino/PKGBUILD +++ b/bino/PKGBUILD @@ -4,36 +4,28 @@ # Contributor: archtux pkgname=bino -pkgver=1.6.8 -pkgrel=4 +pkgver=2.0 +pkgrel=1 pkgdesc='3D video player with multi-display support' arch=('x86_64') url='https://bino3d.org/' license=('GPL3') -depends=('ffmpeg4.4' 'freealut' 'freeglut' 'glewmx' 'libass' 'qt5-base') -optdepends=('lirc: infrared remote control') -source=(https://bino3d.org/releases/${pkgname}-${pkgver}.tar.xz{,.sig} - ffmpeg4.4.patch) -sha512sums=('d8cf5be356add4ed3fb36673038b5ffd92d0dc840798cc616fa4b11fec221c7f114347dfc7cdb7a3a24c5599b56301cddc99f84d3862d8e874612960281319cc' - 'SKIP' - 'f7bf716a6ae12a4542ecaddeaee1078a6c26d9d765db7cc11a1d7b1ae19b295703f5b05e71564f1aad216485b904d81f2670c122e88ab79c7556f5614c0d1639') +depends=('qt6-multimedia' 'qt6-svg' 'qvr') +makedepends=('cmake' 'qt6-tools') +source=(https://bino3d.org/releases/$pkgname-$pkgver.tar.gz{,.sig}) +sha512sums=('5620c506f4de1a9aa7f21f0a23481c5174e7a6a47e6401a84d048dc87843249ef325e33ebc49790d405eb4697c3c571550b0e202f24e758c446ce8e4014f98b3' + 'SKIP') validpgpkeys=('2F61B4828BBA779AECB3F32703A2A4AB1E32FD34') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i '../ffmpeg4.4.patch' -} - build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --with-qt-version=5 \ - #--with-xnvctrl # Enable NVIDIA Quadro SDI output - make + cmake -B build -S "$pkgname-$pkgver" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=OFF + + make -C build -j $(nproc) } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make -C build DESTDIR="$pkgdir" install } diff --git a/bino/ffmpeg4.4.patch b/bino/ffmpeg4.4.patch deleted file mode 100644 index f809290..0000000 --- a/bino/ffmpeg4.4.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -143,25 +143,6 @@ if test -z "$PKG_CONFIG"; then - AC_MSG_WARN([please install pkg-config; Debian package: pkg-config]) - fi - --dnl FFmpeg --PKG_CHECK_MODULES([libavformat], [libavformat >= 52.110.0 libavcodec libavutil], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0]) --if test "$HAVE_LIBAVFORMAT" != "1"; then -- AC_MSG_WARN([required library libavformat >= 52.110.0 not found:]) -- AC_MSG_WARN([$libavformat_PKG_ERRORS]) -- AC_MSG_WARN([libavformat >= 52.110.0 is provided by libav >= 0.7 or FFmpeg >= 0.7]) --fi --PKG_CHECK_MODULES([libavdevice], [libavdevice >= 52.5.0], [HAVE_LIBAVDEVICE=1], [HAVE_LIBAVDEVICE=0]) --if test "$HAVE_LIBAVDEVICE" != "1"; then -- AC_MSG_WARN([required library libavdevice >= 52.5.0 not found:]) -- AC_MSG_WARN([$libavdevice_PKG_ERRORS]) -- AC_MSG_WARN([libavdevice >= 52.5.0 is provided by libav >= 0.7 or FFmpeg >= 0.7]) --fi --PKG_CHECK_MODULES([libswscale], [libswscale >= 0.14.1 libavutil], [HAVE_LIBSWSCALE=1], [HAVE_LIBSWSCALE=0]) --if test "$HAVE_LIBSWSCALE" != "1"; then -- AC_MSG_WARN([required library libswscale >= 0.14.1 not found:]) -- AC_MSG_WARN([$libswscale_PKG_ERRORS]) -- AC_MSG_WARN([libswscale >= 0.14.1 is provided by libav >= 0.7 or FFmpeg >= 0.7]) --fi - AC_CHECK_FUNCS([sysconf]) - - dnl libass -@@ -400,11 +381,16 @@ UPDATE_DESKTOP_DATABASE="" - AC_ARG_VAR([UPDATE_DESKTOP_DATABASE], [update-desktop-database command]) - AC_CHECK_PROGS([UPDATE_DESKTOP_DATABASE], [update-desktop-database]) - -+dnl ffmpeg4.4 libs -+LIBS="$LIBS /usr/lib/libswscale.so.5" -+LIBS="$LIBS /usr/lib/libavutil.so.56" -+LIBS="$LIBS /usr/lib/libavformat.so.58" -+LIBS="$LIBS /usr/lib/libavdevice.so.58" -+LIBS="$LIBS /usr/lib/libavcodec.so.58" -+CPPFLAGS="$CPPFLAGS -I/usr/include/ffmpeg4.4" -+ - dnl Check if all libraries were found - if test "$am_cv_func_iconv" != "yes" \ -- -o "$HAVE_LIBAVFORMAT" != "1" \ -- -o "$HAVE_LIBAVDEVICE" != "1" \ -- -o "$HAVE_LIBSWSCALE" != "1" \ - -o "$HAVE_LIBASS" != "1" \ - -o "$HAVE_LIBOPENAL" != "1" \ - -o "$HAVE_LIBQTOPENGL" != "1" \