Hello community, here is the log from the commit of package libXvMC for openSUSE:Factory checked in at 2019-10-24 23:00:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXvMC (Old) and /work/SRC/openSUSE:Factory/.libXvMC.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXvMC" Thu Oct 24 23:00:58 2019 rev:12 rq:741456 version:1.0.12 Changes: -------- --- /work/SRC/openSUSE:Factory/libXvMC/libXvMC.changes 2019-03-26 22:29:32.317747541 +0100 +++ /work/SRC/openSUSE:Factory/.libXvMC.new.2990/libXvMC.changes 2019-10-24 23:01:04.131957139 +0200 @@ -1,0 +2,18 @@ +Sun Oct 20 18:24:27 UTC 2019 - Stefan Brüns <[email protected]> + +- 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 <[email protected]> + +- 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. +- n_bring-back-libXv-dep.patch + * fixes build of Mesa's xvmc gallium driver, since that + references in XvMCCreateContex also XvQueryAdaptors, + XvFreeAdaptorInfo and XvFreeAdaptorInfo + +------------------------------------------------------------------- Old: ---- libXvMC-1.0.11.tar.bz2 New: ---- libXvMC-1.0.12.tar.bz2 n_bring-back-libXv-dep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXvMC.spec ++++++ --- /var/tmp/diff_new_pack.75fAsj/_old 2019-10-24 23:01:04.691957783 +0200 +++ /var/tmp/diff_new_pack.75fAsj/_new 2019-10-24 23:01:04.695957787 +0200 @@ -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 @@ -29,7 +29,7 @@ #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXvMC/ Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 Source1: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: n_bring-back-libXv-dep.patch #git#BuildRequires: autoconf >= 2.60, automake, libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(videoproto) @@ -64,6 +64,8 @@ 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 @@ -76,6 +78,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --docdir=%_docdir/%name --disable-static @@ -98,6 +101,7 @@ %_includedir/X11/* %_libdir/libXvMC*.so %_libdir/pkgconfig/xvmc.pc +%_libdir/pkgconfig/xvmc-wrapper.pc %_docdir/%name %changelog ++++++ libXvMC-1.0.11.tar.bz2 -> libXvMC-1.0.12.tar.bz2 ++++++ ++++ 5313 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.11/ChangeLog new/libXvMC-1.0.12/ChangeLog --- old/libXvMC-1.0.11/ChangeLog 2019-03-16 23:15:34.000000000 +0100 +++ new/libXvMC-1.0.12/ChangeLog 2019-09-24 18:55:04.000000000 +0200 @@ -1,3 +1,41 @@ +commit 36086307ba9fd1272365b964056e8a6780109478 +Author: Adam Jackson <[email protected]> +Date: Tue Sep 24 12:52:29 2019 -0400 + + libXvMC 1.0.12 + + Signed-off-by: Adam Jackson <[email protected]> + +commit 0fab90b409a3e4848603bdb6b438523038239f23 +Author: Adam Jackson <[email protected]> +Date: Tue Sep 24 12:28:19 2019 -0400 + + vld: Provide <X11/extensions/vldXvMC.h> ourself + + This header refers to libX11 types, it doesn't belong in xorgproto and + has been moved to legacy in 2019.2. Supply it ourselves. + +commit dd9ae03725990ee9c9336bca4b267dfbb696002f +Author: Adam Jackson <[email protected]> +Date: Tue Jul 23 15:28:50 2019 -0400 + + pkgconfig: Remove xv from xvmc.pc + + This library does not itself require libXv for anything. + +commit 0366572c58a85558f9dc7229e74b9a0397becc89 +Author: Dylan Baker <[email protected]> +Date: Mon Jul 8 09:46:28 2019 -0700 + + Add a pkgconfig file for libXvMCW + + Mesa needs to link with this for testing, as do others presumably. + Having a pkg-config file makes this much easier + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110735 + + v2: - remove xv from Requires and Requires.private + commit 63a79d1d087f5121b07510692bf6dd8207d0c0d7 Author: Alan Coopersmith <[email protected]> Date: Sat Mar 16 15:11:28 2019 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.11/Makefile.am new/libXvMC-1.0.12/Makefile.am --- old/libXvMC-1.0.11/Makefile.am 2019-03-16 23:15:18.000000000 +0100 +++ new/libXvMC-1.0.12/Makefile.am 2019-09-24 18:54:56.000000000 +0200 @@ -22,7 +22,7 @@ SUBDIRS = src include wrapper pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xvmc.pc +pkgconfig_DATA = xvmc.pc xvmc-wrapper.pc dist_doc_DATA = XvMC_API.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.11/compile new/libXvMC-1.0.12/compile --- old/libXvMC-1.0.11/compile 2019-03-16 23:15:26.000000000 +0100 +++ new/libXvMC-1.0.12/compile 2019-09-24 18:55:00.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.11/configure.ac new/libXvMC-1.0.12/configure.ac --- old/libXvMC-1.0.11/configure.ac 2019-03-16 23:15:18.000000000 +0100 +++ new/libXvMC-1.0.12/configure.ac 2019-09-24 18:54:56.000000000 +0200 @@ -21,7 +21,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXvMC], [1.0.11], +AC_INIT([libXvMC], [1.0.12], [https://gitlab.freedesktop.org/xorg/lib/libXvMC/issues], [libXvMC]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -61,5 +61,6 @@ include/X11/extensions/Makefile src/Makefile wrapper/Makefile - xvmc.pc]) + xvmc.pc + xvmc-wrapper.pc]) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.11/include/X11/extensions/Makefile.am new/libXvMC-1.0.12/include/X11/extensions/Makefile.am --- old/libXvMC-1.0.11/include/X11/extensions/Makefile.am 2019-03-16 23:15:18.000000000 +0100 +++ new/libXvMC-1.0.12/include/X11/extensions/Makefile.am 2019-09-24 18:54:56.000000000 +0200 @@ -1,2 +1,2 @@ extdir = $(includedir)/X11/extensions -ext_HEADERS = XvMClib.h +ext_HEADERS = XvMClib.h vldXvMC.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.11/include/X11/extensions/vldXvMC.h new/libXvMC-1.0.12/include/X11/extensions/vldXvMC.h --- old/libXvMC-1.0.11/include/X11/extensions/vldXvMC.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libXvMC-1.0.12/include/X11/extensions/vldXvMC.h 2019-09-24 18:54:56.000000000 +0200 @@ -0,0 +1,174 @@ +/***************************************************************************** + * VLD XvMC Nonstandard extension API. + * + * Copyright (c) 2004 The Unichrome Project. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Thomas Hellström, 2004. + */ + + +#ifndef _VLDXVMC_H +#define _VLDXVMC_H + +#include <X11/Xlib.h> +#include <X11/extensions/XvMC.h> + +/* + * New "Motion compensation type". + */ + +#define XVMC_VLD 0x0020000 + +/* + * Below Flags to be passed in the XvMCMpegControl structure 'flag' field. + */ + +#define XVMC_PROGRESSIVE_SEQUENCE 0x00000010 + +/* + * Zig-Zag Scan / Alternative Scan. + */ + +#define XVMC_ZIG_ZAG_SCAN 0x00000000 +#define XVMC_ALTERNATE_SCAN 0x00000100 + +/* + * Frame DCT and frame prediction are used. / + * Field prediction + */ + +#define XVMC_PRED_DCT_FRAME 0x00000040 +#define XVMC_PRED_DCT_FIELD 0x00000000 + +/* + * Top / Bottom field first + */ + +#define XVMC_TOP_FIELD_FIRST 0x00000080 +#define XVMC_BOTTOM_FIELD_FIRST 0x00000000 + +/* + * Motion vectors coded in intra macroblocks + */ + +#define XVMC_CONCEALMENT_MOTION_VECTORS 0x00000200 + +/* + * Which of two mappings between quantiser_scale_code + * and quantiser_scale shall apply. + */ + +#define XVMC_Q_SCALE_TYPE 0x00000400 + +/* + * Intra VLC Format: Bit = 0, Bit = 1 + * Intra blocks B-14 B-15 + * Non-intra blocks B-14 B-14 + */ +#define XVMC_INTRA_VLC_FORMAT 0x00000800 + +/* + * Also XVMC_SECOND_FIELD should be set in flags if active. + */ + +#define XVMC_I_PICTURE 1 +#define XVMC_P_PICTURE 2 +#define XVMC_B_PICTURE 3 + +typedef struct _XvMCMpegControl{ + unsigned + BVMV_range, /* Backward vertical motion vector range */ + BHMV_range, /* Backward horizontal motion vector range */ + FVMV_range, /* Forward vertical motion vector range */ + FHMV_range, /* Forward horizontal motion vector range */ + picture_structure, /* XVMC_TOP_FIELD, XVMC_BOTTOM_FIELD, + * XVMC_FRAME_PICTURE + */ + intra_dc_precision, /* 0x00 - 0x03 corresponds to 8 to 11 bits prec. */ + picture_coding_type,/* XVMC_X_PICTURE */ + mpeg_coding, /* XVMC_MPEG_2 */ + flags; /* See above */ +}XvMCMpegControl; + + +/* + * The following function is called BEFORE starting sending slices to the + * lib. It grabs the decoder hardware and prepares it for coming slices. + * The function XvMCSyncSurface will release the hardware for other contexts + * in addition to it's current functionality. + */ + +extern Status XvMCBeginSurface(Display *display, + XvMCContext *context, + XvMCSurface *target_surface, + XvMCSurface *past_surface, + XvMCSurface *future_surface, + const XvMCMpegControl *control); + + +/* + * The quantizer matrix structure. This should be filled in by the user and + * uploaded whenever a change is needed. The lib initializes with + * default matrices and will automatically load the hardware with new matrices + * on decoder context switches. To load data, set the corresponding load flag + * to true and fill in the values. The VIA MPEG2 engine only uses the + * intra_quantiser_matrix and the non_intra_quantiser_matrix. + */ + +typedef struct _XvMCQMatrix { + int load_intra_quantiser_matrix; + int load_non_intra_quantiser_matrix; + int load_chroma_intra_quantiser_matrix; + int load_chroma_non_intra_quantiser_matrix; + unsigned char intra_quantiser_matrix[64]; + unsigned char non_intra_quantiser_matrix[64]; + unsigned char chroma_intra_quantiser_matrix[64]; + unsigned char chroma_non_intra_quantiser_matrix[64]; +} XvMCQMatrix; + +/* + * Upload a XvMCQMatrix structure to the clientlib. + * The hardware will start using it the next XvMCBeginSurface. + */ + +extern Status XvMCLoadQMatrix(Display *display, XvMCContext *context, + const XvMCQMatrix *qmx); + + +/* + * Put a slice to the decoder. The hardware will start processing it + * immediately. + */ + +extern Status XvMCPutSlice(Display *display,XvMCContext *context, + char *slice, int nBytes); +/* + * Put a slice without the slice start code to the decoder. + * The hardware will start processing it + * immediately. This function is for client optimization. + * XvMCPutSlice(display,context,slice,nBytes) is equivalent to + * XvMCPutSlice2(display,context,slice+4,nBytes-4,slice[3]); + */ + +extern Status XvMCPutSlice2(Display *display,XvMCContext *context, + char *slice, int nBytes, int sliceCode); + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.11/missing new/libXvMC-1.0.12/missing --- old/libXvMC-1.0.11/missing 2019-03-16 23:15:26.000000000 +0100 +++ new/libXvMC-1.0.12/missing 2019-09-24 18:55:00.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.11/wrapper/XvMCWrapper.c new/libXvMC-1.0.12/wrapper/XvMCWrapper.c --- old/libXvMC-1.0.11/wrapper/XvMCWrapper.c 2019-03-16 23:15:18.000000000 +0100 +++ new/libXvMC-1.0.12/wrapper/XvMCWrapper.c 2019-09-24 18:54:56.000000000 +0200 @@ -47,7 +47,7 @@ #include <X11/Xlib.h> #include <X11/extensions/XvMC.h> #include <X11/extensions/XvMClib.h> -#include <X11/extensions/vldXvMC.h> +#include "X11/extensions/vldXvMC.h" #include <dlfcn.h> #include <stdio.h> #include <string.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.11/xvmc-wrapper.pc.in new/libXvMC-1.0.12/xvmc-wrapper.pc.in --- old/libXvMC-1.0.11/xvmc-wrapper.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libXvMC-1.0.12/xvmc-wrapper.pc.in 2019-09-24 18:54:56.000000000 +0200 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XvMCWrapper +Description: XvMC wrapper library +Version: @PACKAGE_VERSION@ +Requires: xproto videoproto +Requires.private: x11 xext +Cflags: -I${includedir} +Libs: -L${libdir} -lXvMCW diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.11/xvmc.pc.in new/libXvMC-1.0.12/xvmc.pc.in --- old/libXvMC-1.0.11/xvmc.pc.in 2019-03-16 23:15:18.000000000 +0100 +++ new/libXvMC-1.0.12/xvmc.pc.in 2019-09-24 18:54:56.000000000 +0200 @@ -6,7 +6,7 @@ Name: XvMC Description: The XvMC Library Version: @PACKAGE_VERSION@ -Requires: xproto videoproto xv -Requires.private: x11 xext xv +Requires: xproto videoproto +Requires.private: x11 xext Cflags: -I${includedir} Libs: -L${libdir} -lXvMC ++++++ n_bring-back-libXv-dep.patch ++++++ 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
