From: Jakub Bogusz Date: Sun, 7 Mar 2021 20:18:40 +0000 (+0100) Subject: - enhanced libtool,version patches, added av patch (allow build clinkcav library... X-Git-Tag: auto/th/clinkc-2.4.1-1~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=c3b47f2f8c1a1c372ddd7476f5041d55672e9b6f;p=packages%2Fclinkc.git - enhanced libtool,version patches, added av patch (allow build clinkcav library with just built libclinkc) - added -av-* subpackages --- diff --git a/clinkc-av.patch b/clinkc-av.patch new file mode 100644 index 0000000..cf8da33 --- /dev/null +++ b/clinkc-av.patch @@ -0,0 +1,43 @@ +--- mupnp-2.4.1/std/av/configure.ac.orig 2021-03-07 20:04:14.110681992 +0100 ++++ mupnp-2.4.1/std/av/configure.ac 2021-03-07 20:06:51.633161953 +0100 +@@ -80,7 +80,6 @@ + ############################## + + AC_CHECK_HEADERS([cybergarage/cupnp.h]) +-AC_CHECK_LIB([clinkc],[cg_upnp_controlpoint_new],,[AC_MSG_ERROR(CyberLink/AV needs CyberLink >= $CLINKC_VERSION)],[-lpthread -lexpat -lxml2]) + + ############################## + # Makefiles +--- mupnp-2.4.1/std/av/lib/unix/Makefile.am.orig 2021-03-07 20:02:15.231326017 +0100 ++++ mupnp-2.4.1/std/av/lib/unix/Makefile.am 2021-03-07 20:08:33.252611433 +0100 +@@ -39,7 +39,7 @@ + libclinkcav_la_SOURCES = \ + $(clinkcav_source) + libclinkcav_a_CFLAGS = $(AM_CFLAGS) +-libclinkcav_la_LIBADD = ++libclinkcav_la_LIBADD = ../../../../lib/unix/libclinkc.la + else + libclinkcav_a_SOURCES = \ + $(clinkcav_source) +--- mupnp-2.4.1/std/av/sample/upnpavserver/filesystem/unix/Makefile.am.orig 2015-02-05 12:07:59.000000000 +0100 ++++ mupnp-2.4.1/std/av/sample/upnpavserver/filesystem/unix/Makefile.am 2021-03-07 20:57:45.103286552 +0100 +@@ -14,7 +14,7 @@ + ../cdms_filesys_main.c + + if HAVE_LIBTOOL +-cdms_filesys_LDADD = -lclinkc ../../../../lib/unix/libclinkcav.la ++cdms_filesys_LDADD = ../../../../lib/unix/libclinkcav.la + else + cdms_filesys_LDADD = -lclinkc ../../../../lib/unix/libclinkcav.a + endif +--- mupnp-2.4.1/std/av/sample/upnpavdump/unix/Makefile.am.orig 2015-02-05 12:07:59.000000000 +0100 ++++ mupnp-2.4.1/std/av/sample/upnpavdump/unix/Makefile.am 2021-03-07 20:59:35.356022595 +0100 +@@ -10,7 +10,7 @@ + ../upnpavdump.c + + if HAVE_LIBTOOL +-upnpavdump_LDADD = -lclinkc ../../../lib/unix/libclinkcav.la ++upnpavdump_LDADD = ../../../lib/unix/libclinkcav.la + else + upnpavdump_LDADD = -lclinkc ../../../lib/unix/libclinkcav.a + endif diff --git a/clinkc-libtool.patch b/clinkc-libtool.patch index 772e094..7f39ee2 100644 --- a/clinkc-libtool.patch +++ b/clinkc-libtool.patch @@ -109,3 +109,51 @@ upnpigddump_LDADD = ../../../lib/unix/libclinkc.a @XML_LIBS@ -#endif +endif +--- mupnp-2.4.1/std/av/configure.ac.orig 2015-02-05 12:07:59.000000000 +0100 ++++ mupnp-2.4.1/std/av/configure.ac 2021-03-07 20:01:33.618218121 +0100 +@@ -33,7 +33,7 @@ + #AC_LANG_CPLUSPLUS + AC_PROG_INSTALL + AC_PROG_AWK +-#AC_PROG_LIBTOOL ++AC_PROG_LIBTOOL + AC_PROG_RANLIB + AM_PROG_CC_C_O + +--- mupnp-2.4.1/std/av/lib/unix/Makefile.am.orig 2015-02-05 12:07:59.000000000 +0100 ++++ mupnp-2.4.1/std/av/lib/unix/Makefile.am 2021-03-07 20:02:15.231326017 +0100 +@@ -1,8 +1,8 @@ +-#if HAVE_LIBTOOL +-#lib_LTLIBRARIES = libclinkcav.la +-#else ++if HAVE_LIBTOOL ++lib_LTLIBRARIES = libclinkcav.la ++else + lib_LIBRARIES = libclinkcav.a +-#endif ++endif + + AM_CPPFLAGS = -I$(top_srcdir)/include + +@@ -35,14 +35,14 @@ + nobase_libclinkcavinclude_HEADERS = \ + $(clinkcav_header) + +-#if HAVE_LIBTOOL +-#libclinkcav_la_SOURCES = \ +-# $(clinkcav_source) +-#libclinkcav_a_CFLAGS = $(AM_CFLAGS) +-#libclinkcav_la_LIBADD = +-#else ++if HAVE_LIBTOOL ++libclinkcav_la_SOURCES = \ ++ $(clinkcav_source) ++libclinkcav_a_CFLAGS = $(AM_CFLAGS) ++libclinkcav_la_LIBADD = ++else + libclinkcav_a_SOURCES = \ + $(clinkcav_source) + libclinkcav_a_CFLAGS = $(AM_CFLAGS) + libclinkcav_a_LIBADD = +-#endif ++endif diff --git a/clinkc-version.patch b/clinkc-version.patch index 71c3663..b9b9d4d 100644 --- a/clinkc-version.patch +++ b/clinkc-version.patch @@ -9,3 +9,14 @@ AC_CONFIG_SRCDIR([include/cybergarage/typedef.h]) AM_INIT_AUTOMAKE([subdir-objects]) +--- mupnp-2.4.1/std/av/configure.ac.orig 2021-03-07 20:01:33.618218121 +0100 ++++ mupnp-2.4.1/std/av/configure.ac 2021-03-07 20:04:14.110681992 +0100 +@@ -14,7 +14,7 @@ + + AC_CONFIG_AUX_DIR(config) + AM_CONFIG_HEADER(config.h) +-AC_INIT([clinkcav], [3.0]) ++AC_INIT([clinkcav], [2.4.1]) + AC_CONFIG_SRCDIR(include/cybergarage/upnp/std/av/cmediaserver.h) + AM_INIT_AUTOMAKE([subdir-objects]) + diff --git a/clinkc.spec b/clinkc.spec index d3e1f7a..4996abc 100644 --- a/clinkc.spec +++ b/clinkc.spec @@ -19,8 +19,9 @@ Patch0: %{name}-libtool.patch Patch1: %{name}-iconv.patch Patch2: %{name}-doc.patch Patch3: %{name}-version.patch +Patch4: %{name}-av.patch URL: https://sourceforge.net/projects/clinkc/ -BuildRequires: autoconf +BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: curl-devel >= 7.13.0 BuildRequires: doxygen @@ -80,12 +81,50 @@ API documentation for clinkc library. %description apidocs -l pl.UTF-8 Dokumentacja API biblioteki clinkc. +%package av +Summary: CyberLink for C UPnP library - AV component +Summary(pl.UTF-8): Biblioteka UPnP CyberLink dla C - komponent AV +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description av +CyberLink for C UPnP library - AV component. + +%description av -l pl.UTF-8 +Biblioteka UPnP CyberLink dla C - komponent AV. + +%package av-devel +Summary: Header files for clinkcav library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki clinkcav +Group: Development/Libraries +Requires: %{name}-av = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} + +%description av-devel +Header files for clinkcav library. + +%description av-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki clinkcav. + +%package av-static +Summary: Static clinkcav library +Summary(pl.UTF-8): Statyczna biblioteka clinkcav +Group: Development/Libraries +Requires: %{name}-av-devel = %{version}-%{release} + +%description av-static +Static clinkcav library. + +%description av-static -l pl.UTF-8 +Statyczna biblioteka clinkcav. + %prep %setup -q -n mupnp-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %{__libtoolize} @@ -97,14 +136,29 @@ Dokumentacja API biblioteki clinkc. %{!?with_static_libs:--disable-static} %{__make} +topdir=$(pwd) +cd std/av +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} +%configure \ + CPPFLAGS="%{rpmcppflags} -I${topdir}/include" \ + %{!?with_static_libs:--disable-static} +%{__make} + %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__make} -C std/av install \ + DESTDIR=$RPM_BUILD_ROOT + # obsoleted by pkg-config -%{__rm} $RPM_BUILD_ROOT%{_libdir}/libclinkc.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libclinkc*.la # compiled binaries %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/clinkc-%{version}/samples # packaged as %doc @@ -125,7 +179,19 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libclinkc.so -%{_includedir}/cybergarage +%dir %{_includedir}/cybergarage +%{_includedir}/cybergarage/http +%{_includedir}/cybergarage/io +%{_includedir}/cybergarage/net +%{_includedir}/cybergarage/soap +%dir %{_includedir}/cybergarage/upnp +%{_includedir}/cybergarage/upnp/control +%{_includedir}/cybergarage/upnp/event +%{_includedir}/cybergarage/upnp/ssdp +%{_includedir}/cybergarage/upnp/*.h +%{_includedir}/cybergarage/util +%{_includedir}/cybergarage/xml +%{_includedir}/cybergarage/typedef.h %{_pkgconfigdir}/clinkc.pc %if %{with static_libs} @@ -139,3 +205,20 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc doxygen/html/*.{css,html,js,png} %endif + +%files av +%defattr(644,root,root,755) +%doc std/av/{COPYING,ChangeLog} +%attr(755,root,root) %{_libdir}/libclinkcav.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclinkcav.so.0 + +%files av-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libclinkcav.so +%{_includedir}/cybergarage/upnp/std + +%if %{with static_libs} +%files av-static +%defattr(644,root,root,755) +%{_libdir}/libclinkcav.a +%endif