[arch-commits] Commit in nageru/trunk (5 files)
Morten Linderud
foxboron at gemini.archlinux.org
Sun Feb 20 17:58:53 UTC 2022
Date: Sunday, February 20, 2022 @ 17:58:52
Author: foxboron
Revision: 1135316
upgpkg: nageru 2.1.0-1: upgpkg: nageru 2.1.0-1
Added:
nageru/trunk/nageru-2.1.0.tar.gz
Modified:
nageru/trunk/PKGBUILD
Deleted:
nageru/trunk/ffmpeg5.patch
nageru/trunk/luajit-patch.patch
nageru/trunk/meson-options.patch
---------------------+
PKGBUILD | 22 +--------
ffmpeg5.patch | 36 ---------------
luajit-patch.patch | 113 --------------------------------------------------
meson-options.patch | 13 -----
nageru-2.1.0.tar.gz | 1
5 files changed, 5 insertions(+), 180 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-20 17:57:34 UTC (rev 1135315)
+++ PKGBUILD 2022-02-20 17:58:52 UTC (rev 1135316)
@@ -1,8 +1,8 @@
# Maintainer: Morten Linderud <foxboron at archlinux.org>
pkgname=nageru
-pkgver=1.8.6
-pkgrel=14
+pkgver=2.1.0
+pkgrel=1
pkgdesc="live video mixer, based around the standard M/E workflow."
arch=(x86_64)
url="https://nageru.sesse.net/"
@@ -11,25 +11,11 @@
'movit' 'bmusb' 'qcustomplot' 'pciutils' 'zita-resampler'
'sqlite3' 'luajit' 'cmake')
makedepends=('meson' 'eigen')
-source=("https://nageru.sesse.net/nageru-${pkgver}.tar.gz"
- "meson-options.patch"
- "luajit-patch.patch"
- "ffmpeg5.patch")
-sha256sums=('67dcb070a23589f624d7067c4b09fe11faa9b1c756b884c50473545fdf7817b3'
- '1bb7d87d6d6359ffe95d605c29ff5f73728929d9393498b74fdf36c6469fdaba'
- '480c4de61188684fc8d1727a2e3ec615d33892234e8466db8011589e9277bdf7'
- 'dc4ff30ebe497a8d63b27023d2d3d8e9ab84b6af40949c86f33e7a0bbc4d2516')
+source=("https://nageru.sesse.net/nageru-${pkgver}.tar.gz")
+sha256sums=('646cc513002646540cfbff746c6fdda2ac365711ead9492a63a06d86a9034389')
-prepare() {
- cd "$pkgname-$pkgver"
- patch -Np1 -i "${srcdir}/luajit-patch.patch"
- patch -Np1 -i "${srcdir}/meson-options.patch"
- patch -Np1 -i "${srcdir}/ffmpeg5.patch"
-}
-
build() {
cd "$pkgname-$pkgver"
- export CXXFLAGS="$CXXFLAGS -fpermissive"
arch-meson ../build
ninja -v -C ../build
}
Deleted: ffmpeg5.patch
===================================================================
--- ffmpeg5.patch 2022-02-20 17:57:34 UTC (rev 1135315)
+++ ffmpeg5.patch 2022-02-20 17:58:52 UTC (rev 1135316)
@@ -1,36 +0,0 @@
-diff --git a/futatabi/export.cpp b/futatabi/export.cpp
-index 7833f91..ca6a558 100644
---- a/futatabi/export.cpp
-+++ b/futatabi/export.cpp
-@@ -17,6 +17,7 @@
-
- extern "C" {
- #include <libavformat/avformat.h>
-+#include <libavutil/channel_layout.h>
- }
-
- using namespace std;
-diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
-index 9647836..6ea3bf1 100644
---- a/futatabi/video_stream.cpp
-+++ b/futatabi/video_stream.cpp
-@@ -3,6 +3,7 @@
- extern "C" {
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
-+#include <libavutil/channel_layout.h>
- }
-
- #include "chroma_subsampler.h"
-diff --git a/nageru/mjpeg_encoder.cpp b/nageru/mjpeg_encoder.cpp
-index 033f67a..a6ae011 100644
---- a/nageru/mjpeg_encoder.cpp
-+++ b/nageru/mjpeg_encoder.cpp
-@@ -9,6 +9,7 @@
-
- extern "C" {
- #include <libavformat/avformat.h>
-+#include <libavutil/channel_layout.h>
- }
-
- #include "defs.h"
Deleted: luajit-patch.patch
===================================================================
--- luajit-patch.patch 2022-02-20 17:57:34 UTC (rev 1135315)
+++ luajit-patch.patch 2022-02-20 17:58:52 UTC (rev 1135316)
@@ -1,113 +0,0 @@
-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 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.
-+
-+/*
-+** Adapted from Lua 5.2.0
-+*/
-+void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
-+ luaL_checkstack(L, nup+1, "too many upvalues");
-+ for (; l->name != NULL; l++) { /* fill the table with given functions */
-+ int i;
-+ lua_pushstring(L, l->name);
-+ for (i = 0; i < nup; i++) /* copy upvalues to the top */
-+ lua_pushvalue(L, -(nup + 1));
-+ lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */
-+ lua_settable(L, -(nup + 3)); /* table must be below the upvalues, the name and the closure */
-+ }
-+ lua_pop(L, nup); /* remove upvalues */
-+}
-+
-+void *luaL_testudata(lua_State *L, int i, const char *tname) {
-+ void *p = lua_touserdata(L, i);
-+ luaL_checkstack(L, 2, "not enough stack slots");
-+ if (p == NULL || !lua_getmetatable(L, i))
-+ return NULL;
-+ else {
-+ int res = 0;
-+ luaL_getmetatable(L, tname);
-+ res = lua_rawequal(L, -1, -2);
-+ lua_pop(L, 2);
-+ if (!res)
-+ p = NULL;
-+ }
-+ return p;
-+}
-+
-+#endif
-+
- class Mixer;
-
- namespace movit {
Deleted: meson-options.patch
===================================================================
--- meson-options.patch 2022-02-20 17:57:34 UTC (rev 1135315)
+++ meson-options.patch 2022-02-20 17:58:52 UTC (rev 1135316)
@@ -1,13 +0,0 @@
-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)
Added: nageru-2.1.0.tar.gz
===================================================================
(Binary files differ)
Index: nageru/trunk/nageru-2.1.0.tar.gz
===================================================================
--- nageru-2.1.0.tar.gz 2022-02-20 17:57:34 UTC (rev 1135315)
+++ nageru-2.1.0.tar.gz 2022-02-20 17:58:52 UTC (rev 1135316)
Property changes on: nageru/trunk/nageru-2.1.0.tar.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/gzip
\ No newline at end of property
More information about the arch-commits
mailing list