From 09e84bcbb40c9ebad34eeeb5bd16df19b0b39b81 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 15 Nov 2019 00:37:47 +0100 Subject: [PATCH 1/2] revert ABI bump --- f95662fca27e7e2940c22110335654db46bf9c39.diff | 14 +++++++++++ libdvdread-no-abi-bump.patch | 24 +++++++++++++++++++ libdvdread.spec | 15 ++++++++++-- 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 f95662fca27e7e2940c22110335654db46bf9c39.diff create mode 100644 libdvdread-no-abi-bump.patch diff --git a/f95662fca27e7e2940c22110335654db46bf9c39.diff b/f95662fca27e7e2940c22110335654db46bf9c39.diff new file mode 100644 index 0000000..b774dd1 --- /dev/null +++ b/f95662fca27e7e2940c22110335654db46bf9c39.diff @@ -0,0 +1,14 @@ +diff --git a/src/dvdread/ifo_types.h b/src/dvdread/ifo_types.h +index 22ece66e65bdb822671665b6cee70a5d9a2baa97..f679d29434761e47072a2787607634cae203ef37 100644 +--- a/src/dvdread/ifo_types.h ++++ b/src/dvdread/ifo_types.h +@@ -294,8 +294,8 @@ typedef struct { + uint16_t next_pgc_nr; + uint16_t prev_pgc_nr; + uint16_t goup_pgc_nr; +- uint8_t still_time; + uint8_t pg_playback_mode; ++ uint8_t still_time; + uint32_t palette[16]; /* New type struct {zero_1, Y, Cr, Cb} ? */ + uint16_t command_tbl_offset; + uint16_t program_map_offset; diff --git a/libdvdread-no-abi-bump.patch b/libdvdread-no-abi-bump.patch new file mode 100644 index 0000000..c20dc20 --- /dev/null +++ b/libdvdread-no-abi-bump.patch @@ -0,0 +1,24 @@ +diff -up libdvdread-6.0.2/configure.no-abi-bump libdvdread-6.0.2/configure +--- libdvdread-6.0.2/configure.no-abi-bump 2019-09-01 16:40:09.000000000 +0200 ++++ libdvdread-6.0.2/configure 2019-11-15 00:34:48.905831947 +0100 +@@ -12069,8 +12069,8 @@ ac_config_headers="$ac_config_headers co + + + +-DVDREAD_LT_CURRENT=7 +-DVDREAD_LT_AGE=0 ++DVDREAD_LT_CURRENT=6 ++DVDREAD_LT_AGE=2 + DVDREAD_LT_REVISION=0 + + DVDREAD_LTVERSION=$DVDREAD_LT_CURRENT:$DVDREAD_LT_REVISION:$DVDREAD_LT_AGE +diff -up libdvdread-6.0.2/NEWS.orig libdvdread-6.0.2/NEWS +--- libdvdread-6.0.2/NEWS.orig 2019-09-01 16:33:36.000000000 +0200 ++++ libdvdread-6.0.2/NEWS 2019-11-15 11:28:51.210392106 +0100 +@@ -1,6 +1,5 @@ + libdvdread (6.0.2) + * use reentrant getmntent_r +- * fix playback of some discs, by fixing pgc_t structure + + libdvdread (6.0.1) + * fix a regression on some DVDs, like Resident Evil diff --git a/libdvdread.spec b/libdvdread.spec index 18dc678..9d2752e 100644 --- a/libdvdread.spec +++ b/libdvdread.spec @@ -1,12 +1,18 @@ +%global abi 4 + Name: libdvdread Version: 6.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for reading DVD video discs based on Ogle code License: GPLv2+ URL: http://dvdnav.mplayerhq.hu/ Source0: https://download.videolan.org/pub/videolan/libdvdread/%{version}/libdvdread-%{version}.tar.bz2 Source1: https://download.videolan.org/pub/videolan/libdvdread/%{version}/libdvdread-%{version}.tar.bz2.asc Source2: https://download.videolan.org/pub/keys/7180713BE58D1ADC.asc +# revert SONAME bump in 6.0.2 +Patch0: %{name}-no-abi-bump.patch +# revert struct field swap +Patch1: https://code.videolan.org/videolan/libdvdread/commit/f95662fca27e7e2940c22110335654db46bf9c39.diff BuildRequires: gcc BuildRequires: gnupg2 Provides: bundled(md5-gcc) @@ -29,6 +35,8 @@ This package contains development files for libdvdread. %prep %gpgverify --keyring='%{S:2}' --signature='%{S:1}' --data='%{S:0}' %setup -q +%patch0 -p1 +%patch1 -p1 -R %build %configure --disable-static @@ -44,7 +52,7 @@ rm %{buildroot}%{_libdir}/libdvdread.la %{buildroot}%{_pkgdocdir}/COPYING %files %license COPYING %doc AUTHORS NEWS README -%{_libdir}/libdvdread.so.* +%{_libdir}/libdvdread.so.%{abi}* %files devel %doc %{_pkgdocdir}/ChangeLog @@ -54,6 +62,9 @@ rm %{buildroot}%{_libdir}/libdvdread.la %{buildroot}%{_pkgdocdir}/COPYING %{_libdir}/pkgconfig/dvdread.pc %changelog +* Thu Nov 14 2019 Dominik Mierzejewski 6.0.2-2 +- revert abi bump + * Mon Oct 14 2019 Dominik Mierzejewski 6.0.2-1 - update to 6.0.2 (#1761254) - use new gpgverify macro From 78cef2f0ca4b8b5aeabb087a411ac8d28e36b62e Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 15 Nov 2019 12:01:29 +0100 Subject: [PATCH 2/2] fix gpgverify macro call --- libdvdread.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdvdread.spec b/libdvdread.spec index 9d2752e..425e574 100644 --- a/libdvdread.spec +++ b/libdvdread.spec @@ -33,7 +33,7 @@ It provides the functionality that is required to access many DVDs. This package contains development files for libdvdread. %prep -%gpgverify --keyring='%{S:2}' --signature='%{S:1}' --data='%{S:0}' +%{gpgverify} --keyring='%{S:2}' --signature='%{S:1}' --data='%{S:0}' %setup -q %patch0 -p1 %patch1 -p1 -R