[arch-commits] Commit in (5 files)

David Runge dvzrv at archlinux.org
Wed Sep 23 22:07:39 UTC 2020


    Date: Wednesday, September 23, 2020 @ 22:07:39
  Author: dvzrv
Revision: 711610

Add libupnp1.12 for a few packages that can not be built against libupnp 1.14.0.

Added:
  libupnp1.12/
  libupnp1.12/repos/
  libupnp1.12/trunk/
  libupnp1.12/trunk/PKGBUILD
  libupnp1.12/trunk/libupnp1.12-build.patch

-------------------------+
 PKGBUILD                |   50 ++++++++
 libupnp1.12-build.patch |  261 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 311 insertions(+)

Added: libupnp1.12/trunk/PKGBUILD
===================================================================
--- libupnp1.12/trunk/PKGBUILD	                        (rev 0)
+++ libupnp1.12/trunk/PKGBUILD	2020-09-23 22:07:39 UTC (rev 711610)
@@ -0,0 +1,50 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: kastor <kastor at fobos.org.ar>
+
+_name=pupnp
+pkgname=libupnp1.12
+pkgver=1.12.1
+pkgrel=1
+pkgdesc='Portable Open Source UPnP Development Kit (legacy 1.12 branch)'
+url='http://pupnp.sourceforge.net/'
+arch=('x86_64')
+license=('BSD')
+depends=('glibc')
+makedepends=('pkgconfig')
+provides=('libupnp-1.12.so' 'libixml-1.12.so')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_name}/${_name}/archive/release-${pkgver}.tar.gz"
+        "${pkgname}-build.patch")
+sha512sums=('e4741f9245378529a15b8be7acec5af52d802ce84b82f110dab44c30da65fc2514d51d3bee6311643eb28146ea90bb3c97f44f800edb4f3ccccc1681f3e70f80'
+            'c6af9af97e3ef54e45ecec5b4aac5a3819d5a73c36970ec19ba4cec4d3139782ae767ac02d49da3087c8976f6d1fc045e1bdba765c9a41be43c2e4292c0bcbd6')
+b2sums=('e44847dda5a7aeabb22a5b76cdc48d1dc69e70f7ecac85824199bf8d6e9b802cb717f2959f70690cc00babf1b554a0cb031995f80c28246b9eec670ebe7aaa90'
+        'c51cbf157aeb84b301e93f2757140a2878f13d1a55dea6390ef5bfc02c8e2ed178cf77c720ac73d180e134188d522a94b45e25b4113eca9974fe4a13c6f9f72f')
+
+prepare() {
+  mv -v ${_name}-release-${pkgver} ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
+  # rename the shared libraries and include directories, so that they do not
+  # conflict with libupnp
+  patch -Np1 -i "../${pkgname}-build.patch"
+  autoreconf -fiv
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${pkgname}-${pkgver}
+  make -k check
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm 644 {ChangeLog,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
+
+# vim: ts=2 sw=2 et:

Added: libupnp1.12/trunk/libupnp1.12-build.patch
===================================================================
--- libupnp1.12/trunk/libupnp1.12-build.patch	                        (rev 0)
+++ libupnp1.12/trunk/libupnp1.12-build.patch	2020-09-23 22:07:39 UTC (rev 711610)
@@ -0,0 +1,261 @@
+diff -ruN a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2020-04-07 18:45:40.000000000 +0200
++++ b/Makefile.am	2020-09-24 00:00:25.770875019 +0200
+@@ -14,7 +14,7 @@
+ 
+ EXTRA_DIST = \
+ 	docs/Doxyfile \
+-	libupnp.pc.in \
++	libupnp-1-12.pc.in \
+ 	libupnp.spec \
+ 	build/msvc/inttypes.h \
+ 	build/msvc/stdint.h
+@@ -23,7 +23,7 @@
+ # This variable must have 'exec' in its name, in order to be installed 
+ # by 'install-exec' target (instead of default 'install-data')
+ pkgconfigexecdir = $(libdir)/pkgconfig
+-pkgconfigexec_DATA = libupnp.pc
++pkgconfigexec_DATA = libupnp-1.12.pc
+ 
+ $(pkgconfigexec_DATA): config.status
+ 
+diff -ruN a/configure.ac b/configure.ac
+--- a/configure.ac	2020-04-07 18:45:40.000000000 +0200
++++ b/configure.ac	2020-09-23 23:59:15.547619119 +0200
+@@ -798,7 +798,7 @@
+ 	upnp/doc/Makefile
+ 	upnp/sample/Makefile
+ 	upnp/unittest/Makefile
+-	libupnp.pc
++	libupnp-1.12.pc
+ 	])
+ 
+ AC_OUTPUT
+diff -ruN a/ixml/Makefile.am b/ixml/Makefile.am
+--- a/ixml/Makefile.am	2020-04-07 18:45:40.000000000 +0200
++++ b/ixml/Makefile.am	2020-09-24 00:02:32.304077027 +0200
+@@ -11,7 +11,7 @@
+                           -I$(top_srcdir)/upnp/inc
+ AM_CFLAGS		= 
+ 
+-LDADD			= libixml.la
++LDADD			= libixml-1.12.la
+ 
+ if ENABLE_DEBUG
+     AM_CPPFLAGS		+= -DDEBUG
+@@ -23,12 +23,12 @@
+     AM_CPPFLAGS		+= -DIXML_HAVE_SCRIPTSUPPORT
+ endif
+ 
+-lib_LTLIBRARIES		= libixml.la
++lib_LTLIBRARIES		= libixml-1.12.la
+ 
+-libixml_la_LDFLAGS	= -version-info $(LT_VERSION_IXML) \
++libixml_1_12_la_LDFLAGS	= -version-info $(LT_VERSION_IXML) \
+ 			  -export-symbols-regex '^ixml.*'
+ 
+-libixml_la_SOURCES	= \
++libixml_1_12_la_SOURCES	= \
+ 			src/attr.c \
+ 			src/document.c \
+ 			src/element.c \
+@@ -42,7 +42,7 @@
+ 			src/node.c \
+ 			src/nodeList.c
+ 
+-upnpincludedir		= $(includedir)/upnp
++upnpincludedir		= $(includedir)/upnp-1.12
+ upnpinclude_HEADERS	= \
+ 			inc/ixml.h \
+ 			inc/ixmldebug.h
+diff -ruN a/libupnp-1.12.pc.in b/libupnp-1.12.pc.in
+--- a/libupnp-1.12.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ b/libupnp-1.12.pc.in	2020-09-23 23:58:18.524351481 +0200
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libupnp-1-12
++Description: Linux SDK for UPnP Devices
++Version: @VERSION@
++Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp-1-12 -lixml-1-12
++Libs.private: @OPENSSL_LIBS@
++Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp-1.12
++
+diff -ruN a/libupnp.pc.in b/libupnp.pc.in
+--- a/libupnp.pc.in	2020-04-07 18:45:40.000000000 +0200
++++ b/libupnp.pc.in	1970-01-01 01:00:00.000000000 +0100
+@@ -1,12 +0,0 @@
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
+-
+-Name: libupnp
+-Description: Linux SDK for UPnP Devices
+-Version: @VERSION@
+-Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml
+-Libs.private: @OPENSSL_LIBS@
+-Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
+-
+diff -ruN a/upnp/Makefile.am b/upnp/Makefile.am
+--- a/upnp/Makefile.am	2020-04-07 18:45:40.000000000 +0200
++++ b/upnp/Makefile.am	2020-09-24 00:02:06.760769444 +0200
+@@ -11,11 +11,11 @@
+ 	-I$(top_srcdir)/ixml/inc
+ 
+ LDADD = \
+-	libupnp.la \
+-	$(top_builddir)/ixml/libixml.la
++	libupnp-1.12.la \
++	$(top_builddir)/ixml/libixml-1.12.la
+ 
+ 
+-upnpincludedir = $(includedir)/upnp
++upnpincludedir = $(includedir)/upnp-1.12
+ upnpinclude_HEADERS = \
+ 	inc/ActionComplete.h \
+ 	inc/ActionRequest.h \
+@@ -47,16 +47,16 @@
+ endif
+ 
+ 
+-lib_LTLIBRARIES = libupnp.la
++lib_LTLIBRARIES = libupnp-1.12.la
+ 
+-libupnp_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/src/inc 
++libupnp_1_12_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/src/inc 
+ 
+-libupnp_la_LDFLAGS = \
++libupnp_1_12_la_LDFLAGS = \
+ 	-version-info $(LT_VERSION_UPNP) \
+ 	-export-symbols-regex '^Upnp.*' \
+-	$(top_builddir)/ixml/libixml.la
++	$(top_builddir)/ixml/libixml-1.12.la
+ 
+-libupnp_la_SOURCES = \
++libupnp_1_12_la_SOURCES = \
+ 	src/inc/config.h \
+ 	src/inc/client_table.h \
+ 	src/inc/ClientSubscription.h \
+@@ -92,8 +92,8 @@
+ upnpinclude_HEADERS += \
+ 	inc/ithread.h
+ 
+-libupnp_la_CPPFLAGS += -I$(srcdir)/src/threadutil
+-libupnp_la_SOURCES += \
++libupnp_1_12_la_CPPFLAGS += -I$(srcdir)/src/threadutil
++libupnp_1_12_la_SOURCES += \
+ 	src/threadutil/FreeList.h \
+ 	src/threadutil/FreeList.c \
+ 	src/threadutil/LinkedList.h \
+@@ -105,7 +105,7 @@
+ 
+ # ssdp
+ if ENABLE_SSDP
+-libupnp_la_SOURCES += \
++libupnp_1_12_la_SOURCES += \
+ 	src/ssdp/ssdp_ResultData.c \
+ 	src/ssdp/ssdp_ResultData.h \
+ 	src/ssdp/ssdp_device.c \
+@@ -115,14 +115,14 @@
+ 
+ # soap
+ if ENABLE_SOAP
+-libupnp_la_SOURCES += \
++libupnp_1_12_la_SOURCES += \
+ 	src/soap/soap_device.c \
+ 	src/soap/soap_ctrlpt.c \
+ 	src/soap/soap_common.c
+ endif
+ 
+ # genlib
+-libupnp_la_SOURCES += \
++libupnp_1_12_la_SOURCES += \
+ 	src/genlib/miniserver/miniserver.c \
+ 	src/genlib/client_table/client_table.c \
+ 	src/genlib/client_table/ClientSubscription.c \
+@@ -142,14 +142,14 @@
+ 
+ # gena
+ if ENABLE_GENA
+-libupnp_la_SOURCES += \
++libupnp_1_12_la_SOURCES += \
+ 	src/gena/gena_device.c \
+ 	src/gena/gena_ctrlpt.c \
+ 	src/gena/gena_callback2.c
+ endif
+ 
+ # api
+-libupnp_la_SOURCES += \
++libupnp_1_12_la_SOURCES += \
+ 	src/api/ActionComplete.c \
+ 	src/api/ActionRequest.c \
+ 	src/api/Discovery.c \
+@@ -164,11 +164,11 @@
+ 	src/api/upnpapi.c
+ 
+ if ENABLE_TOOLS
+-libupnp_la_SOURCES += src/api/upnptools.c
++libupnp_1_12_la_SOURCES += src/api/upnptools.c
+ endif
+ 
+ if ENABLE_DEBUG
+-libupnp_la_SOURCES += src/api/upnpdebug.c 
++libupnp_1_12_la_SOURCES += src/api/upnpdebug.c 
+ AM_CPPFLAGS         += -DDEBUG -DSTATS
+ else
+ AM_CPPFLAGS         += -DNDEBUG
+@@ -177,7 +177,7 @@
+ 
+ # uuid
+ if ENABLE_UUID
+-libupnp_la_SOURCES += \
++libupnp_1_12_la_SOURCES += \
+ 	src/uuid/md5.c \
+ 	src/uuid/sysdep.c \
+ 	src/uuid/uuid.c
+@@ -185,11 +185,11 @@
+ 
+ 
+ # urlconfig
+-libupnp_la_SOURCES += src/urlconfig/urlconfig.c
++libupnp_1_12_la_SOURCES += src/urlconfig/urlconfig.c
+ 
+ 
+ # inet_pton (needed on Win32, compiles to nothing elsewhere)
+-libupnp_la_SOURCES += \
++libupnp_1_12_la_SOURCES += \
+ 	src/inet_pton.c \
+ 	src/inc/inet_pton.h
+ 
+diff -ruN a/upnp/sample/Makefile.am b/upnp/sample/Makefile.am
+--- a/upnp/sample/Makefile.am	2020-04-07 18:45:40.000000000 +0200
++++ b/upnp/sample/Makefile.am	2020-09-24 00:02:48.734060646 +0200
+@@ -9,8 +9,8 @@
+ 	-I$(top_srcdir)/ixml/inc
+ 
+ LDADD = \
+-	$(top_builddir)/upnp/libupnp.la \
+-	$(top_builddir)/ixml/libixml.la
++	$(top_builddir)/upnp/libupnp-1.12.la \
++	$(top_builddir)/ixml/libixml-1.12.la
+ 
+ # samples
+ noinst_PROGRAMS =
+diff -ruN a/upnp/unittest/Makefile.am b/upnp/unittest/Makefile.am
+--- a/upnp/unittest/Makefile.am	2020-04-07 18:45:40.000000000 +0200
++++ b/upnp/unittest/Makefile.am	2020-09-24 00:03:02.407380454 +0200
+@@ -10,8 +10,8 @@
+ 	-I$(top_srcdir)/upnp/src/inc
+ 
+ LDADD = \
+-	$(top_builddir)/upnp/libupnp.la \
+-	$(top_builddir)/ixml/libixml.la
++	$(top_builddir)/upnp/libupnp-1.12.la \
++	$(top_builddir)/ixml/libixml-1.12.la
+ 
+ #unittest
+ noinst_PROGRAMS = unittest



More information about the arch-commits mailing list