Hello community, here is the log from the commit of package tvheadend for openSUSE:Leap:15.2 checked in at 2020-05-13 13:47:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/tvheadend (Old) and /work/SRC/openSUSE:Leap:15.2/.tvheadend.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tvheadend" Wed May 13 13:47:54 2020 rev:26 rq:804912 version:4.2.8 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/tvheadend/tvheadend.changes 2020-01-15 16:26:32.240689699 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.tvheadend.new.2738/tvheadend.changes 2020-05-13 13:47:59.941393406 +0200 @@ -1,0 +2,29 @@ +Tue Mar 24 13:35:39 UTC 2020 - Martin Pluskal <[email protected]> + +- Switch to py3 (build time dependency) + +------------------------------------------------------------------- +Wed Oct 9 00:04:02 UTC 2019 - Stefan BrĂ¼ns <[email protected]> + +- Fix configure checks when compiling with LTO. Due to the broken + checks, linking fails. + + Add fix_configure_checks_with_LTO.patch +- Some spec file cleanup (license macro). + +------------------------------------------------------------------- +Tue Feb 12 21:09:46 UTC 2019 - [email protected] + +- No longer force the use of ffmpeg3 versions of pkgconfig(libav*). + +------------------------------------------------------------------- +Sat Jan 12 21:15:40 UTC 2019 - Manu Maier <[email protected]> + +- Update to version 4.2.8. For a changelog see + https://github.com/tvheadend/tvheadend/compare/v4.2.6...v4.2.8 + +------------------------------------------------------------------- +Fri May 4 14:03:47 UTC 2018 - [email protected] + +- Use ffmpeg3 versions of pkgconfig(libav*) + +------------------------------------------------------------------- Old: ---- dvb-scan-git20180220.tar.gz tvheadend-4.2.6.tar.gz New: ---- dvb-scan-git20190112.tar.gz fix_configure_checks_with_LTO.patch tvheadend-4.2.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tvheadend.spec ++++++ --- /var/tmp/diff_new_pack.jr6Clu/_old 2020-05-13 13:48:00.417394431 +0200 +++ /var/tmp/diff_new_pack.jr6Clu/_new 2020-05-13 13:48:00.417394431 +0200 @@ -1,7 +1,7 @@ # # spec file for package tvheadend # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2016 Packman Team <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -13,20 +13,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates -%endif - %define htsgroup video %define htsuser hts %define homedir %{_localstatedir}/lib/tvheadend Name: tvheadend -Version: 4.2.6 +Version: 4.2.8 Release: 0 Summary: A TV Streaming Server # parsers are from FFMpeg project under LGPL-2.1 @@ -34,18 +29,20 @@ # rest of code seems to be GPL-3.0+ License: GPL-3.0-or-later AND LGPL-2.1-only Group: Productivity/Multimedia/Other -Url: https://tvheadend.org/ +URL: https://tvheadend.org/ Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source2: %{name}-rpmlintrc Source3: %{name}_super # From https://github.com/tvheadend/dtv-scan-tables.git as build system fails to retrieve them -Source4: dvb-scan-git20180220.tar.gz +Source4: dvb-scan-git20190112.tar.gz # PATCH-FIX-OPENSUSE tvheadend-fix-service-dependency.patch -- do not wait for or require syslog Patch2: %{name}-fix-service-dependency.patch +# PATCH-FIX-UPSTREAM -- fix unsufficient configure checks when using LTO (check optimized away) +Patch3: fix_configure_checks_with_LTO.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: python-devel +BuildRequires: python3-base BuildRequires: pkgconfig(avahi-client) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(libavcodec) @@ -57,10 +54,8 @@ BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(liburiparser) BuildRequires: pkgconfig(zlib) -%if 0%{?suse_version} > 1320 Requires(pre): group(%{htsgroup}) -%endif -%{?systemd_requires} +%{?systemd_ordering} %description A TV streaming server supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, @@ -73,6 +68,7 @@ %prep %setup -q %patch2 -p1 +%patch3 -p1 sed -e "s/-u \([^ ]*\) -g \([^ ]*\)/-u %{htsuser} -g %{htsgroup}/" -i rpm/%{name}.sysconfig sed -e '/^TVH_ARGS/cTVH_ARGS="-C"' -i debian/%{name}.default @@ -84,12 +80,13 @@ %build export CFLAGS_NO_WERROR="yes" %configure \ + --python=%{_bindir}/python3 \ --disable-ffmpeg_static \ --disable-hdhomerun_static mkdir -p data/dvb-scan tar -C data/dvb-scan -xvf %{SOURCE4} touch data/dvb-scan/.stamp -make V=1 %{?_smp_mflags} +%make_build %install %make_install @@ -123,7 +120,7 @@ %pre %service_add_pre %{name}.service -getent passwd %htsuser >/dev/null || %{_sbindir}/useradd -g %{htsgroup} -m -d %{homedir} -r -s /bin/false %{htsuser} -c "Tvheadend TV server" +getent passwd %{htsuser} >/dev/null || %{_sbindir}/useradd -g %{htsgroup} -m -d %{homedir} -r -s /bin/false %{htsuser} -c "Tvheadend TV server" %preun %service_del_preun %{name}.service @@ -132,8 +129,8 @@ %service_del_postun %{name}.service %files -%defattr(-,root,root) -%doc CONTRIBUTING.md LICENSE.md +%doc CONTRIBUTING.md +%license LICENSE.md %{_bindir}/tvheadend %{_datadir}/tvheadend %{_mandir}/man1/tvheadend.1%{?ext_man} ++++++ dvb-scan-git20180220.tar.gz -> dvb-scan-git20190112.tar.gz ++++++ ++++ 4715 lines of diff (skipped) ++++++ fix_configure_checks_with_LTO.patch ++++++ >From 77ef695f0e76a5f989febfccdc19972ec438fa37 Mon Sep 17 00:00:00 2001 From: StefanBruens <[email protected]> Date: Wed, 9 Oct 2019 01:52:50 +0200 Subject: [PATCH] Avoid configure checks being optimized away with LTO In case the checks are compiled with CFLAGS including "-O1 -flto" (or any other optimization level), a "test()" function not referenced by by main will be optimized away and discarded prior to the final linking step, and there will be no undefined symbols, thus the checks always succeeds. This at least affects the "strlcpy"/"strlcat" checks, but may affects other checks as well. --- configure | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/configure b/configure index e5f6f593b6..e76760479a 100755 --- a/configure +++ b/configure @@ -177,27 +177,31 @@ else fi check_cc_snippet strlcat '#include <string.h> -int test(int argc, char **argv) { +#define TEST test +int test() { char dst[10]; strlcat("test", dst, sizeof(dst)); return 0; }' check_cc_snippet strlcpy '#include <string.h> -int test(int argc, char **argv) { +#define TEST test +int test() { char dst[10]; strlcpy("test", dst, sizeof(dst)); return 0; }' check_cc_snippet fdatasync '#include <unistd.h> -int test(int argc, char **argv) { +#define TEST test +int test() { fdatasync(0); return 0; }' check_cc_snippet getloadavg '#include <stdlib.h> -void test() { getloadavg(NULL,0); }' +#define TEST test +int test() { return getloadavg(NULL,0); }' check_cc_snippet atomic32 '#include <stdint.h> int test(int *ptr){ @@ -222,6 +226,7 @@ return __sync_fetch_and_add(ptr, (void *)1); }' check_cc_snippet bitops64 '#include <stdint.h> +#define TEST test int test(void){ int l = sizeof(long); return l == 8 ? 0 : 1; @@ -312,6 +317,7 @@ int test(void) # note that iconv routines are mandatory check_cc_snippet libiconv ' #include <iconv.h> +#define TEST test int test(void) { iconv_t ic = iconv_open("ASCII", "ASCII"); @@ -327,6 +333,7 @@ fi check_cc_snippet ifnames ' #include <net/if.h> +#define TEST test int test(void) { struct if_nameindex *ifnames = if_nameindex(); ++++++ tvheadend-4.2.6.tar.gz -> tvheadend-4.2.8.tar.gz ++++++ /work/SRC/openSUSE:Leap:15.2/tvheadend/tvheadend-4.2.6.tar.gz /work/SRC/openSUSE:Leap:15.2/.tvheadend.new.2738/tvheadend-4.2.8.tar.gz differ: char 24, line 1
