From c912a5ffc27f648a39650f17a9aecd4fd4075281d902c2c9921561939b955165 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 25 Sep 2019 15:07:08 +0000 Subject: [PATCH 1/6] - Update to version 1.0.12 * This release fixes the pkgconfig data to not refer to libXv, adds a pkgconfig file for libXvMCW, and prepares for a future xorgproto release. There should be no functional changes. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXvMC?expand=0&rev=19 --- libXvMC-1.0.11.tar.bz2 | 3 --- libXvMC-1.0.12.tar.bz2 | 3 +++ libXvMC.changes | 8 ++++++++ libXvMC.spec | 5 +++-- 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 libXvMC-1.0.11.tar.bz2 create mode 100644 libXvMC-1.0.12.tar.bz2 diff --git a/libXvMC-1.0.11.tar.bz2 b/libXvMC-1.0.11.tar.bz2 deleted file mode 100644 index fdc0579..0000000 --- a/libXvMC-1.0.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a2e34d444a683a7c010b01b23cefe2b8043a063ce4dc6a9b855836b5262622d -size 303516 diff --git a/libXvMC-1.0.12.tar.bz2 b/libXvMC-1.0.12.tar.bz2 new file mode 100644 index 0000000..623ee38 --- /dev/null +++ b/libXvMC-1.0.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd +size 306581 diff --git a/libXvMC.changes b/libXvMC.changes index 11b4318..e988dae 100644 --- a/libXvMC.changes +++ b/libXvMC.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 25 15:04:17 UTC 2019 - Stefan Dirsch + +- Update to version 1.0.12 + * This release fixes the pkgconfig data to not refer to libXv, + adds a pkgconfig file for libXvMCW, and prepares for a future + xorgproto release. There should be no functional changes. + ------------------------------------------------------------------- Fri Mar 22 11:21:33 UTC 2019 - Stefan Dirsch diff --git a/libXvMC.spec b/libXvMC.spec index 18c7f1f..7e84e6d 100644 --- a/libXvMC.spec +++ b/libXvMC.spec @@ -12,13 +12,13 @@ # 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/ # Name: libXvMC %define lname libXvMC1 -Version: 1.0.11 +Version: 1.0.12 Release: 0 Summary: X-Video Motion Compensation library License: MIT @@ -98,6 +98,7 @@ rm -f "%buildroot/%_libdir"/*.la %_includedir/X11/* %_libdir/libXvMC*.so %_libdir/pkgconfig/xvmc.pc +%_libdir/pkgconfig/xvmc-wrapper.pc %_docdir/%name %changelog From da56c5822b5737b8067dc648e4de5da4dddb5c64205fef629d9d41178fd5f277 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 23:28:03 +0000 Subject: [PATCH 2/6] - back to version 1.0.11 in order to easily fix Mesa-drivers build again ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXvMC?expand=0&rev=20 --- libXvMC-1.0.11.tar.bz2 | 3 +++ libXvMC-1.0.12.tar.bz2 | 3 --- libXvMC.changes | 6 ++++++ libXvMC.spec | 3 +-- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 libXvMC-1.0.11.tar.bz2 delete mode 100644 libXvMC-1.0.12.tar.bz2 diff --git a/libXvMC-1.0.11.tar.bz2 b/libXvMC-1.0.11.tar.bz2 new file mode 100644 index 0000000..fdc0579 --- /dev/null +++ b/libXvMC-1.0.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a2e34d444a683a7c010b01b23cefe2b8043a063ce4dc6a9b855836b5262622d +size 303516 diff --git a/libXvMC-1.0.12.tar.bz2 b/libXvMC-1.0.12.tar.bz2 deleted file mode 100644 index 623ee38..0000000 --- a/libXvMC-1.0.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd -size 306581 diff --git a/libXvMC.changes b/libXvMC.changes index e988dae..1cba5ad 100644 --- a/libXvMC.changes +++ b/libXvMC.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 26 23:25:26 UTC 2019 - Stefan Dirsch + +- back to version 1.0.11 in order to easily fix Mesa-drivers build + again ... + ------------------------------------------------------------------- Wed Sep 25 15:04:17 UTC 2019 - Stefan Dirsch diff --git a/libXvMC.spec b/libXvMC.spec index 7e84e6d..c4d5b46 100644 --- a/libXvMC.spec +++ b/libXvMC.spec @@ -18,7 +18,7 @@ Name: libXvMC %define lname libXvMC1 -Version: 1.0.12 +Version: 1.0.11 Release: 0 Summary: X-Video Motion Compensation library License: MIT @@ -98,7 +98,6 @@ rm -f "%buildroot/%_libdir"/*.la %_includedir/X11/* %_libdir/libXvMC*.so %_libdir/pkgconfig/xvmc.pc -%_libdir/pkgconfig/xvmc-wrapper.pc %_docdir/%name %changelog From 6179babcc1e7338e94adc1a28f49bc64fb753b9cf411aa49a85696213f62c008 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 30 Sep 2019 09:56:53 +0000 Subject: [PATCH 3/6] - Update to version 1.0.12 * This release fixes the pkgconfig data to not refer to libXv, adds a pkgconfig file for libXvMCW, and prepares for a future xorgproto release. There should be no functional changes. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXvMC?expand=0&rev=21 --- libXvMC-1.0.11.tar.bz2 | 3 --- libXvMC-1.0.12.tar.bz2 | 3 +++ libXvMC.changes | 8 ++++++++ libXvMC.spec | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 libXvMC-1.0.11.tar.bz2 create mode 100644 libXvMC-1.0.12.tar.bz2 diff --git a/libXvMC-1.0.11.tar.bz2 b/libXvMC-1.0.11.tar.bz2 deleted file mode 100644 index fdc0579..0000000 --- a/libXvMC-1.0.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a2e34d444a683a7c010b01b23cefe2b8043a063ce4dc6a9b855836b5262622d -size 303516 diff --git a/libXvMC-1.0.12.tar.bz2 b/libXvMC-1.0.12.tar.bz2 new file mode 100644 index 0000000..623ee38 --- /dev/null +++ b/libXvMC-1.0.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd +size 306581 diff --git a/libXvMC.changes b/libXvMC.changes index 1cba5ad..682f240 100644 --- a/libXvMC.changes +++ b/libXvMC.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 30 09:54:48 UTC 2019 - Stefan Dirsch + +- Update to version 1.0.12 + * This release fixes the pkgconfig data to not refer to libXv, + adds a pkgconfig file for libXvMCW, and prepares for a future + xorgproto release. There should be no functional changes. + ------------------------------------------------------------------- Thu Sep 26 23:25:26 UTC 2019 - Stefan Dirsch diff --git a/libXvMC.spec b/libXvMC.spec index c4d5b46..7e84e6d 100644 --- a/libXvMC.spec +++ b/libXvMC.spec @@ -18,7 +18,7 @@ Name: libXvMC %define lname libXvMC1 -Version: 1.0.11 +Version: 1.0.12 Release: 0 Summary: X-Video Motion Compensation library License: MIT @@ -98,6 +98,7 @@ rm -f "%buildroot/%_libdir"/*.la %_includedir/X11/* %_libdir/libXvMC*.so %_libdir/pkgconfig/xvmc.pc +%_libdir/pkgconfig/xvmc-wrapper.pc %_docdir/%name %changelog From 008e9ddfffbdaf11dccf2cb1743eb0d41593cadbb4ea2ea7bc9af4e8c2881651 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 30 Sep 2019 11:01:46 +0000 Subject: [PATCH 4/6] - n_bring-back-libXv-dep.patch * fixes build of Mesa's xvmc gallium driver, since that references in XvMCCreateContex also XvQueryAdaptors, XvFreeAdaptorInfo and XvFreeAdaptorInfo OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXvMC?expand=0&rev=22 --- libXvMC.changes | 4 ++++ libXvMC.spec | 2 ++ n_bring-back-libXv-dep.patch | 14 ++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 n_bring-back-libXv-dep.patch diff --git a/libXvMC.changes b/libXvMC.changes index 682f240..d56e683 100644 --- a/libXvMC.changes +++ b/libXvMC.changes @@ -5,6 +5,10 @@ Mon Sep 30 09:54:48 UTC 2019 - Stefan Dirsch * This release fixes the pkgconfig data to not refer to libXv, adds a pkgconfig file for libXvMCW, and prepares for a future xorgproto release. There should be no functional changes. +- n_bring-back-libXv-dep.patch + * fixes build of Mesa's xvmc gallium driver, since that + references in XvMCCreateContex also XvQueryAdaptors, + XvFreeAdaptorInfo and XvFreeAdaptorInfo ------------------------------------------------------------------- Thu Sep 26 23:25:26 UTC 2019 - Stefan Dirsch diff --git a/libXvMC.spec b/libXvMC.spec index 7e84e6d..85e3ac0 100644 --- a/libXvMC.spec +++ b/libXvMC.spec @@ -29,6 +29,7 @@ Url: http://xorg.freedesktop.org/ #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXvMC/ Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 Source1: baselibs.conf +Patch0: n_bring-back-libXv-dep.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake, libtool BuildRequires: pkgconfig @@ -76,6 +77,7 @@ in %lname. %prep %setup -q +%patch0 -p1 %build %configure --docdir=%_docdir/%name --disable-static diff --git a/n_bring-back-libXv-dep.patch b/n_bring-back-libXv-dep.patch new file mode 100644 index 0000000..1cb6a1a --- /dev/null +++ b/n_bring-back-libXv-dep.patch @@ -0,0 +1,14 @@ +diff --git a/xvmc.pc.in b/xvmc.pc.in +index 51b88ce..ecf81d2 100644 +--- a/xvmc.pc.in ++++ b/xvmc.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: XvMC + Description: The XvMC Library + Version: @PACKAGE_VERSION@ +-Requires: xproto videoproto +-Requires.private: x11 xext ++Requires: xproto videoproto xv ++Requires.private: x11 xext xv + Cflags: -I${includedir} + Libs: -L${libdir} -lXvMC From 10aba83070f51772b2375d7f17e4bb1a8e0228cee34f04d1f4099d46fe63b5af Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 30 Sep 2019 12:04:38 +0000 Subject: [PATCH 5/6] cleanup in .changes file OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXvMC?expand=0&rev=23 --- libXvMC.changes | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/libXvMC.changes b/libXvMC.changes index d56e683..907d9c1 100644 --- a/libXvMC.changes +++ b/libXvMC.changes @@ -10,20 +10,6 @@ Mon Sep 30 09:54:48 UTC 2019 - Stefan Dirsch references in XvMCCreateContex also XvQueryAdaptors, XvFreeAdaptorInfo and XvFreeAdaptorInfo -------------------------------------------------------------------- -Thu Sep 26 23:25:26 UTC 2019 - Stefan Dirsch - -- back to version 1.0.11 in order to easily fix Mesa-drivers build - again ... - -------------------------------------------------------------------- -Wed Sep 25 15:04:17 UTC 2019 - Stefan Dirsch - -- Update to version 1.0.12 - * This release fixes the pkgconfig data to not refer to libXv, - adds a pkgconfig file for libXvMCW, and prepares for a future - xorgproto release. There should be no functional changes. - ------------------------------------------------------------------- Fri Mar 22 11:21:33 UTC 2019 - Stefan Dirsch From 52525b8bd10b98e5a8e2d6ec9a59f4fc2203cdec4f20090261959b050e5074f9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 21 Oct 2019 09:43:13 +0000 Subject: [PATCH 6/6] Accepting request 741340 from home:StefanBruens:branches:X11:XOrg - Add conflicts for old xorgproto-devel, X11/extensions/vldXvMC.h was moved to libXvMC-devel. OBS-URL: https://build.opensuse.org/request/show/741340 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXvMC?expand=0&rev=24 --- libXvMC.changes | 6 ++++++ libXvMC.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libXvMC.changes b/libXvMC.changes index 907d9c1..5ff8fd0 100644 --- a/libXvMC.changes +++ b/libXvMC.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 20 18:24:27 UTC 2019 - Stefan Brüns + +- Add conflicts for old xorgproto-devel, X11/extensions/vldXvMC.h + was moved to libXvMC-devel. + ------------------------------------------------------------------- Mon Sep 30 09:54:48 UTC 2019 - Stefan Dirsch diff --git a/libXvMC.spec b/libXvMC.spec index 85e3ac0..c9b76f1 100644 --- a/libXvMC.spec +++ b/libXvMC.spec @@ -30,7 +30,6 @@ Url: http://xorg.freedesktop.org/ Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch0: n_bring-back-libXv-dep.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake, libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(videoproto) @@ -65,6 +64,8 @@ comp, iDCT, and VLD (Variable-Length Decoding) for MPEG-2/MPEG-4-ASP. Summary: Development files for the X-Video Motion Compensation library Group: Development/Libraries/C and C++ Requires: %lname = %version +Conflicts: xorgproto-devel < 2019.2 +Provides: xorgproto-devel:%{_includedir}/X11/extensions/vldXvMC.h %description devel X-Video Motion Compensation (XvMC), is an extension of the X video