pipewire patched for xdg-desktop-portal-kde build failure

lua move to 5.2, conky can no longer use 5.1, that version is over 4 years old, packages not ready for newer, disable lua
mpv rebuild, disabled lua
rrdtool & nmap normal rebuild

lua/PKGBUILD

@@ -1,7 +1,7 @@
 
 pkgname=lua 
-pkgver=5.1.5
-pkgrel=6
+pkgver=5.2.4
+pkgrel=1
 pkgdesc="A powerful light-weight programming language designed for extending applications." 
 arch=('x86_64')
 url="https://www.lua.org/" 
@@ -10,15 +10,15 @@ license=('MIT')
 options=('!makeflags' '!emptydirs')
 source=("https://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz"
         'lua-arch.patch'
-        'lua-5.1-cflags.diff')
-md5sums=('2e115fe26e435e33b0d5c022e4490567'
-         '2649d884c2bb68162a27b2bd44824430'
-         '249582bf1fd861ccf492d2c35a9fe732')
+        'lua.pc')
+sha1sums=('ef15259421197e3d85b7d6e4871b8c26fd82c1cf'
+          '84bf5c3fed26e6a3e317a8f29cbdc68fc3607cf5'
+          'efdf59c5f914eaae26877491ea882e7f41ab866f')
 
 build() { 
   cd ${pkgname}-${pkgver}
   patch -p1 -i ${srcdir}/lua-arch.patch
-  patch -p1 -i ${srcdir}/lua-5.1-cflags.diff
+  #patch -p1 -i ${srcdir}/lua-5.1-cflags.diff
 
   export CFLAGS="$CFLAGS -fPIC"
   make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
@@ -27,13 +27,13 @@ build() {
 package() {
   cd ${pkgname}-${pkgver}
   make INSTALL_DATA="cp -d" \
-    TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.${pkgver}" \
+    TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.${pkgver}" \
     INSTALL_TOP=${pkgdir}/usr \
     INSTALL_MAN=${pkgdir}/usr/share/man/man1 \
     install
 
-  install -D -m644 etc/lua.pc ${pkgdir}/usr/lib/pkgconfig/lua.pc
-  install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT
+  install -D -m644 ../../lua.pc ${pkgdir}/usr/lib/pkgconfig/lua.pc
+  install -D -m644 doc/readme.html ${pkgdir}/usr/share/licenses/${pkgname}/readme.html
 
   install -d ${pkgdir}/usr/share/doc/lua
   install -m644 doc/*.{gif,png,css,html} ${pkgdir}/usr/share/doc/lua

lua/lua-arch.patch

@@ -1,66 +1,57 @@
-diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc
---- lua-5.1.4/etc/lua.pc	2008-08-08 14:46:11.000000000 +0200
-+++ lua-5.1.4-new/etc/lua.pc	2012-02-23 18:25:34.000000000 +0100
-@@ -8,6 +8,6 @@
+diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile
+--- lua-5.2.1/Makefile	2012-05-17 16:05:54.000000000 +0200
++++ lua-5.2.1.new/Makefile	2012-09-12 22:39:07.162748096 +0200
+@@ -52,7 +52,7 @@
+ all:	$(PLAT)
+
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) $@ V=$(V) R=$(R)
+
+ test:	dummy
+ 	src/lua -v
+diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h
+--- lua-5.2.1/src/luaconf.h	2012-05-11 16:14:42.000000000 +0200
++++ lua-5.2.1.new/src/luaconf.h	2012-09-12 22:40:27.986622772 +0200
+@@ -100,7 +100,7 @@
+ #else			/* }{ */
 
- # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
--prefix= /usr/local
-+prefix= /usr
- INSTALL_BIN= ${prefix}/bin
- INSTALL_INC= ${prefix}/include
- INSTALL_LIB= ${prefix}/lib
-diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h
---- lua-5.1.4/src/luaconf.h	2008-02-11 17:25:08.000000000 +0100
-+++ lua-5.1.4-new/src/luaconf.h	2012-02-23 18:25:34.000000000 +0100
-@@ -94,7 +94,7 @@
-	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
-
- #else
+ #define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
 -#define LUA_ROOT	"/usr/local/"
 +#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR
  #define LUA_PATH_DEFAULT  \
-diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
---- lua-5.1.4/src/Makefile	2008-01-19 20:37:58.000000000 +0100
-+++ lua-5.1.4-new/src/Makefile	2012-02-23 18:26:43.000000000 +0100
-@@ -23,6 +23,7 @@
+diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile
+--- lua-5.2.1/src/Makefile	2012-03-09 17:32:16.000000000 +0100
++++ lua-5.2.1.new/src/Makefile	2012-09-12 22:38:08.591386896 +0200
+@@ -29,6 +29,7 @@
  PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
 
  LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
- 	lundump.o lvm.o lzio.o
-@@ -36,7 +37,7 @@
- LUAC_O=	luac.o print.o
++LUA_SO= liblua.so
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+ 	ltm.o lundump.o lvm.o lzio.o
+@@ -43,7 +44,7 @@
+ LUAC_O=	luac.o
 
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
 -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
  ALL_A= $(LUA_A)
 
- default: $(PLAT)
-@@ -51,6 +52,11 @@
- 	$(AR) $@ $?
+ # Targets start here.
+@@ -59,6 +60,12 @@
+ 	$(AR) $@ $(BASE_O)
  	$(RANLIB) $@
 
 +$(LUA_SO): $(CORE_O) $(LIB_O)
 +	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
 +	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
 +	ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
 +
  $(LUA_T): $(LUA_O) $(LUA_A)
- 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
---- lua-5.1.4/Makefile	2008-08-12 02:40:48.000000000 +0200
-+++ lua-5.1.4-new/Makefile	2012-02-23 19:06:32.000000000 +0100
-@@ -53,7 +53,7 @@
- all:	$(PLAT)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
 
- $(PLATS) clean:
--	cd src && $(MAKE) $@
-+	cd src && $(MAKE) $@ V=$(V) R=$(R)
-
- test:	dummy
-	src/lua test/hello.lua

lua/lua.pc

@@ -0,0 +1,28 @@
+# lua.pc -- pkg-config data for Lua
+
+# vars from install Makefile
+
+V=%VER%
+R=%REL%
+
+prefix=/usr
+INSTALL_BIN=${prefix}/bin
+INSTALL_INC=${prefix}/include
+INSTALL_LIB=${prefix}/lib
+INSTALL_MAN=${prefix}/man/man1
+INSTALL_LMOD=${prefix}/share/lua/${V}
+INSTALL_CMOD=${prefix}/lib/lua/${V}
+
+# canonical vars
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires: 
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
+
+# (end of lua.pc)

mpv/PKGBUILD

@@ -1,14 +1,14 @@
 
 pkgname=mpv
 pkgver=0.29.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Video player based on MPlayer/mplayer2'
 arch=('x86_64')
 license=('GPL')
 url='http://mpv.io'
 depends=('ffmpeg' 'lcms2' 'libdvdread' 'libcdio' 'libcdio-paranoia' 'libgl' 'libxinerama'
          'libxv' 'libxkbcommon' 'libva' 'wayland' 'desktop-file-utils' 'hicolor-icon-theme'
-         'xdg-utils' 'libdvdnav' 'youtube-dl' 'libass' 'libbluray' 'lua' 'libxrandr' 'jack'
+         'xdg-utils' 'libdvdnav' 'youtube-dl' 'libass' 'libbluray' 'libxrandr' 'jack'
          'rubberband' 'samba' 'libxss' 'libcaca')
 makedepends=('mesa' 'python2-docutils' 'ladspa' 'perl')
 options=('!emptydirs' '!buildflags')

nmap/PKGBUILD

@@ -1,7 +1,7 @@
 
 pkgname=nmap
 pkgver=7.70
-pkgrel=2
+pkgrel=3
 pkgdesc="Network exploration tool and security/port scanner"
 arch=('x86_64')
 url="https://nmap.org"

pipewire/PKGBUILD

@@ -2,16 +2,24 @@
 pkgname=pipewire
 
 pkgver=0.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Project that aims to greatly improve handling of audio and video under Linux"
 url="https://pipewire.org"
 arch=("x86_64")
 license=('LGPL2.1')
 depends=('gst-plugins-base' 'v4l-utils' 'sbc' 'ffmpeg' 'rtkit')
 makedepends=('meson' 'ninja')
 install=pipewire.install
-source=("https://github.com/PipeWire/pipewire/archive/${pkgver}.tar.gz")
-md5sums=('558660cd68f7119ba9477dd996e7d041')
+source=("https://github.com/PipeWire/pipewire/archive/${pkgver}.tar.gz"
+        "https://github.com/PipeWire/pipewire/commit/371da358d1580dc06218d18a12a99611cac39e4e.diff")
+md5sums=('558660cd68f7119ba9477dd996e7d041'
+         'd37fd4104172591c01acdef9d08a1dc1')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # build failure in xdg-desktop-portal-kde, upstream fix
+  patch -p1 -i ${srcdir}/371da358d1580dc06218d18a12a99611cac39e4e.diff
+}
 
 build() {
   mkdir -p build

rrdtool/PKGBUILD

@@ -1,7 +1,7 @@
 
 pkgname=rrdtool
 pkgver=1.7.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Data logging and graphing application"
 arch=('x86_64')
 url="https://www.rrdtool.org"