[arch-commits] Commit in nageru/trunk (PKGBUILD)
Date: Wednesday, August 5, 2020 @ 07:06:45
Author: alucryd
Revision: 669044
upgpkg: nageru 1.8.6-7
Modified:
nageru/trunk/PKGBUILD
--+
PKGBUILD |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-08-05 07:05:04 UTC (rev 669043)
+++ PKGBUILD2020-08-05 07:06:45 UTC (rev 669044)
@@ -2,7 +2,7 @@
pkgname=nageru
pkgver=1.8.6
-pkgrel=6
+pkgrel=7
pkgdesc="live video mixer, based around the standard M/E workflow."
arch=(x86_64)
url="https://nageru.sesse.net/;
@@ -26,6 +26,7 @@
build() {
cd "$pkgname-$pkgver"
+ export CXXFLAGS="$CXXFLAGS -fpermissive"
arch-meson ../build
ninja -v -C ../build
}
[arch-commits] Commit in nageru/trunk (PKGBUILD)
Date: Saturday, May 23, 2020 @ 22:08:55 Author: arojas Revision: 632664 protobuf 3.12 rebuild Modified: nageru/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-23 22:08:33 UTC (rev 632663) +++ PKGBUILD2020-05-23 22:08:55 UTC (rev 632664) @@ -2,7 +2,7 @@ pkgname=nageru pkgver=1.8.6 -pkgrel=5 +pkgrel=6 pkgdesc="live video mixer, based around the standard M/E workflow." arch=(x86_64) url="https://nageru.sesse.net/;
[arch-commits] Commit in nageru/trunk (PKGBUILD)
Date: Monday, April 13, 2020 @ 18:57:28 Author: foxboron Revision: 613707 upgpkg: nageru 1.8.6-5 Modified: nageru/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-04-13 18:49:16 UTC (rev 613706) +++ PKGBUILD2020-04-13 18:57:28 UTC (rev 613707) @@ -2,7 +2,7 @@ pkgname=nageru pkgver=1.8.6 -pkgrel=4 +pkgrel=5 pkgdesc="live video mixer, based around the standard M/E workflow." arch=(x86_64) url="https://nageru.sesse.net/;
[arch-commits] Commit in nageru/trunk (PKGBUILD)
Date: Saturday, January 4, 2020 @ 12:58:41 Author: alucryd Revision: 547892 x264 159 rebuild: nageru 1.8.6-4 Modified: nageru/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-01-04 12:47:12 UTC (rev 547891) +++ PKGBUILD2020-01-04 12:58:41 UTC (rev 547892) @@ -2,7 +2,7 @@ pkgname=nageru pkgver=1.8.6 -pkgrel=3 +pkgrel=4 pkgdesc="live video mixer, based around the standard M/E workflow." arch=(x86_64) url="https://nageru.sesse.net/;
[arch-commits] Commit in nageru/trunk (PKGBUILD)
Date: Saturday, December 7, 2019 @ 21:11:41 Author: foxboron Revision: 536321 upgpkg: nageru 1.8.6-3 Modified: nageru/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-12-07 20:52:24 UTC (rev 536320) +++ PKGBUILD2019-12-07 21:11:41 UTC (rev 536321) @@ -2,7 +2,7 @@ pkgname=nageru pkgver=1.8.6 -pkgrel=2 +pkgrel=3 pkgdesc="live video mixer, based around the standard M/E workflow." arch=(x86_64) url="https://nageru.sesse.net/;
[arch-commits] Commit in nageru/trunk (PKGBUILD meson-options.patch)
Date: Friday, October 18, 2019 @ 20:41:00
Author: foxboron
Revision: 517115
upgpkg: nageru 1.8.6-2
Added threaddep for futatabi
Added:
nageru/trunk/meson-options.patch
Modified:
nageru/trunk/PKGBUILD
-+
PKGBUILD|7 +--
meson-options.patch | 13 +
2 files changed, 18 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-18 20:40:59 UTC (rev 517114)
+++ PKGBUILD2019-10-18 20:41:00 UTC (rev 517115)
@@ -1,8 +1,8 @@
-# Maintainer: Morten Linderd
+# Maintainer: Morten Linderud
pkgname=nageru
pkgver=1.8.6
-pkgrel=1
+pkgrel=2
pkgdesc="live video mixer, based around the standard M/E workflow."
arch=(x86_64)
url="https://nageru.sesse.net/;
@@ -12,13 +12,16 @@
'sqlite3' 'luajit' 'cmake')
makedepends=('meson' 'eigen')
source=("https://nageru.sesse.net/nageru-${pkgver}.tar.gz;
+"meson-options.patch"
"luajit-patch.patch")
sha256sums=('67dcb070a23589f624d7067c4b09fe11faa9b1c756b884c50473545fdf7817b3'
+'1bb7d87d6d6359ffe95d605c29ff5f73728929d9393498b74fdf36c6469fdaba'
'480c4de61188684fc8d1727a2e3ec615d33892234e8466db8011589e9277bdf7')
prepare() {
cd "$pkgname-$pkgver"
patch -Np1 -i "${srcdir}/luajit-patch.patch"
+patch -Np1 -i "${srcdir}/meson-options.patch"
}
build() {
Added: meson-options.patch
===
--- meson-options.patch (rev 0)
+++ meson-options.patch 2019-10-18 20:41:00 UTC (rev 517115)
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 1540b19..b959ca5 100644
+--- a/meson.build
b/meson.build
+@@ -306,7 +306,7 @@ futatabi_shader_srcs = bin2h_gen.process(shaders)
+ futatabi_srcs += futatabi_shader_srcs
+
+ executable('futatabi', futatabi_srcs,
+- dependencies: [shareddep, qt5deps, libjpegdep, movitdep,
libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep,
libavformatdep, libavcodecdep, libavutildep, libswscaledep],
++ dependencies: [shareddep, qt5deps, libjpegdep, movitdep,
libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep,
threaddep, libavformatdep, libavcodecdep, libavutildep, libswscaledep],
+ link_with: shared,
+ include_directories: [include_directories('futatabi')],
+ install: true)
[arch-commits] Commit in nageru/trunk (PKGBUILD luajit-patch.patch)
Date: Saturday, July 13, 2019 @ 13:14:54
Author: foxboron
Revision: 489357
upgpkg: nageru 1.8.6-1
Added:
nageru/trunk/PKGBUILD
nageru/trunk/luajit-patch.patch
+
PKGBUILD | 40 ++
luajit-patch.patch | 113 +++
2 files changed, 153 insertions(+)
Added: PKGBUILD
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-07-13 13:14:54 UTC (rev 489357)
@@ -0,0 +1,40 @@
+# Maintainer: Morten Linderd
+
+pkgname=nageru
+pkgver=1.8.6
+pkgrel=1
+pkgdesc="live video mixer, based around the standard M/E workflow."
+arch=(x86_64)
+url="https://nageru.sesse.net/;
+license=('GPL3')
+depends=('libmicrohttpd' 'ffmpeg' 'libx264' 'protobuf'
+ 'movit' 'bmusb' 'qcustomplot' 'pciutils' 'zita-resampler'
+ 'sqlite3' 'luajit' 'cmake')
+makedepends=('meson' 'eigen')
+source=("https://nageru.sesse.net/nageru-${pkgver}.tar.gz;
+"luajit-patch.patch")
+sha256sums=('67dcb070a23589f624d7067c4b09fe11faa9b1c756b884c50473545fdf7817b3'
+'480c4de61188684fc8d1727a2e3ec615d33892234e8466db8011589e9277bdf7')
+
+prepare() {
+cd "$pkgname-$pkgver"
+patch -Np1 -i "${srcdir}/luajit-patch.patch"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ arch-meson ../build
+ ninja -v -C ../build
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+ ninja -C ../build test
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ DESTDIR="$pkgdir" ninja -C ../build install
+}
+
+# vim:set ts=2 sw=2 et:
Added: luajit-patch.patch
===
--- luajit-patch.patch (rev 0)
+++ luajit-patch.patch 2019-07-13 13:14:54 UTC (rev 489357)
@@ -0,0 +1,113 @@
+diff --git a/README b/README
+index ed86214..86eb42a 100644
+--- a/README
b/README
+@@ -70,7 +70,7 @@ Nageru currently needs:
+ - libzita-resampler, for resampling sound sources so that they are in sync
+between sources, and also for oversampling for the peak meter.
+
+- - LuaJIT, for driving the theme engine. You will need at least version 2.1.
++ - LuaJIT, for driving the theme engine.
+
+ - libjpeg, for encoding MJPEG streams when VA-API JPEG support is not
+available.
+@@ -257,3 +257,27 @@ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE
SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
++
++
++Marked parts of theme.cpp (Lua shims):
++
++The MIT License (MIT)
++
++Copyright (c) 2013 Hisham Muhammad
++
++Permission is hereby granted, free of charge, to any person obtaining a copy
of
++this software and associated documentation files (the "Software"), to deal in
++the Software without restriction, including without limitation the rights to
++use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of
++the Software, and to permit persons to whom the Software is furnished to do
so,
++subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all
++copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS
++FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
++COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
++IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+diff --git a/nageru/theme.cpp b/nageru/theme.cpp
+index dc73c2c..43174fa 100644
+--- a/nageru/theme.cpp
b/nageru/theme.cpp
+@@ -41,6 +41,67 @@
+ #include "pbo_frame_allocator.h"
+ #include "scene.h"
+
++#if !defined LUA_VERSION_NUM || LUA_VERSION_NUM==501
++
++// Compatibility shims for LuaJIT 2.0 (LuaJIT 2.1 implements the entire Lua
5.2 API).
++// Adapted from
https://github.com/keplerproject/lua-compat-5.2/blob/master/c-api/compat-5.2.c
++// and licensed as follows:
++//
++// The MIT License (MIT)
++//
++// Copyright (c) 2013 Hisham Muhammad
++//
++// Permission is hereby granted, free of charge, to any person obtaining a
copy of
++// this software and associated documentation files (the "Software"), to deal
in
++// the Software without restriction, including without limitation the rights
to
++// use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of
++// the Software, and to permit persons to whom the Software is furnished to
do so,
++// subject to the following conditions:
++//
++// The above copyright notice and this permission notice shall be included in
all
++// copies or substantial portions of the Software.
++//
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY
