Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/xorg]: xsrc/external/mit/libXvMC/dist initial import of libXvMC-1.0.12
details: https://anonhg.NetBSD.org/xsrc/rev/15311cb4fb71
branches: xorg
changeset: 10438:15311cb4fb71
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Feb 23 09:01:48 2020 +0000
description:
initial import of libXvMC-1.0.12
diffstat:
external/mit/libXvMC/dist/ChangeLog | 38 +
external/mit/libXvMC/dist/Makefile.am | 2 +-
external/mit/libXvMC/dist/Makefile.in | 34 +-
external/mit/libXvMC/dist/aclocal.m4 | 317 +-
external/mit/libXvMC/dist/compile | 13 +-
external/mit/libXvMC/dist/config.guess | 122 +-
external/mit/libXvMC/dist/config.sub | 2663 ++++-----
external/mit/libXvMC/dist/configure | 293 +-
external/mit/libXvMC/dist/configure.ac | 5 +-
external/mit/libXvMC/dist/depcomp | 10 +-
external/mit/libXvMC/dist/include/Makefile.in | 15 +-
external/mit/libXvMC/dist/include/X11/Makefile.in | 15 +-
external/mit/libXvMC/dist/include/X11/extensions/Makefile.am | 2 +-
external/mit/libXvMC/dist/include/X11/extensions/Makefile.in | 15 +-
external/mit/libXvMC/dist/include/X11/extensions/vldXvMC.h | 174 +
external/mit/libXvMC/dist/install-sh | 47 +-
external/mit/libXvMC/dist/ltmain.sh | 8 +-
external/mit/libXvMC/dist/missing | 16 +-
external/mit/libXvMC/dist/src/Makefile.in | 34 +-
external/mit/libXvMC/dist/wrapper/Makefile.in | 34 +-
external/mit/libXvMC/dist/wrapper/XvMCWrapper.c | 2 +-
external/mit/libXvMC/dist/xvmc-wrapper.pc.in | 12 +
external/mit/libXvMC/dist/xvmc.pc.in | 4 +-
23 files changed, 2125 insertions(+), 1750 deletions(-)
diffs (truncated from 5420 to 300 lines):
diff -r a48d73afb7aa -r 15311cb4fb71 external/mit/libXvMC/dist/ChangeLog
--- a/external/mit/libXvMC/dist/ChangeLog Sun Feb 23 09:01:46 2020 +0000
+++ b/external/mit/libXvMC/dist/ChangeLog Sun Feb 23 09:01:48 2020 +0000
@@ -1,3 +1,41 @@
+commit 36086307ba9fd1272365b964056e8a6780109478
+Author: Adam Jackson <ajax%redhat.com@localhost>
+Date: Tue Sep 24 12:52:29 2019 -0400
+
+ libXvMC 1.0.12
+
+ Signed-off-by: Adam Jackson <ajax%redhat.com@localhost>
+
+commit 0fab90b409a3e4848603bdb6b438523038239f23
+Author: Adam Jackson <ajax%redhat.com@localhost>
+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 <ajax%redhat.com@localhost>
+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 <dylan%pnwbakers.com@localhost>
+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 <alan.coopersmith%oracle.com@localhost>
Date: Sat Mar 16 15:11:28 2019 -0700
diff -r a48d73afb7aa -r 15311cb4fb71 external/mit/libXvMC/dist/Makefile.am
--- a/external/mit/libXvMC/dist/Makefile.am Sun Feb 23 09:01:46 2020 +0000
+++ b/external/mit/libXvMC/dist/Makefile.am Sun Feb 23 09:01:48 2020 +0000
@@ -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 -r a48d73afb7aa -r 15311cb4fb71 external/mit/libXvMC/dist/Makefile.in
--- a/external/mit/libXvMC/dist/Makefile.in Sun Feb 23 09:01:46 2020 +0000
+++ b/external/mit/libXvMC/dist/Makefile.in Sun Feb 23 09:01:48 2020 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -120,7 +120,7 @@
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = xvmc.pc
+CONFIG_CLEAN_FILES = xvmc.pc xvmc-wrapper.pc
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -185,7 +185,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
+ cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
@@ -209,8 +209,9 @@
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/xvmc.pc.in COPYING ChangeLog INSTALL compile \
- config.guess config.sub install-sh ltmain.sh missing
+ $(srcdir)/xvmc-wrapper.pc.in $(srcdir)/xvmc.pc.in COPYING \
+ ChangeLog INSTALL compile config.guess config.sub install-sh \
+ ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -400,7 +401,7 @@
top_srcdir = @top_srcdir@
SUBDIRS = src include wrapper
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xvmc.pc
+pkgconfig_DATA = xvmc.pc xvmc-wrapper.pc
dist_doc_DATA = XvMC_API.txt
MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = README.md
@@ -429,8 +430,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -458,6 +459,8 @@
-rm -f config.h stamp-h1
xvmc.pc: $(top_builddir)/config.status $(srcdir)/xvmc.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+xvmc-wrapper.pc: $(top_builddir)/config.status $(srcdir)/xvmc-wrapper.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -616,7 +619,10 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -684,7 +690,7 @@
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
@@ -709,7 +715,7 @@
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -727,7 +733,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -737,7 +743,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff -r a48d73afb7aa -r 15311cb4fb71 external/mit/libXvMC/dist/aclocal.m4
--- a/external/mit/libXvMC/dist/aclocal.m4 Sun Feb 23 09:01:46 2020 +0000
+++ b/external/mit/libXvMC/dist/aclocal.m4 Sun Feb 23 09:01:48 2020 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -2881,6 +2881,9 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -2889,7 +2892,7 @@
# appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[
]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9049,9 +9052,9 @@
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29)
-dnl
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 11 (pkg-config-0.29.1)
+
dnl Copyright © 2004 Scott James Remnant <scott%netsplit.com@localhost>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists%gmail.com@localhost>
dnl
@@ -9092,7 +9095,7 @@
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29])
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@@ -9325,6 +9328,74 @@
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+dnl [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN([PKG_WITH_MODULES],
+[
+m4_pushdef([with_arg], m4_tolower([$1]))
+
+m4_pushdef([description],
+ [m4_default([$5], [build with ]with_arg[ support])])
+
+m4_pushdef([def_arg], [m4_default([$6], [auto])])
+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
+
+m4_case(def_arg,
+ [yes],[m4_pushdef([with_without], [--without-]with_arg)],
+ [m4_pushdef([with_without],[--with-]with_arg)])
+
+AC_ARG_WITH(with_arg,
+ AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
+ [AS_TR_SH([with_]with_arg)=def_arg])
+
+AS_CASE([$AS_TR_SH([with_]with_arg)],
+ [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
+ [auto],[PKG_CHECK_MODULES([$1],[$2],
+ [m4_n([def_action_if_found]) $3],
+ [m4_n([def_action_if_not_found]) $4])])
+
+m4_popdef([with_arg])
+m4_popdef([description])
+m4_popdef([def_arg])
+
+])dnl PKG_WITH_MODULES
+
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [DESCRIPTION], [DEFAULT])
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._[VARIABLE-PREFIX] is exported as make variable.
+AC_DEFUN([PKG_HAVE_WITH_MODULES],
+[
+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
+
+AM_CONDITIONAL([HAVE_][$1],
+ [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
+])dnl PKG_HAVE_WITH_MODULES
+
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
+dnl and preprocessor variable.
+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
+[
+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
+
+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
Home |
Main Index |
Thread Index |
Old Index