Hello community, here is the log from the commit of package libvdpau for openSUSE:Factory checked in at 2013-02-04 20:53:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvdpau (Old) and /work/SRC/openSUSE:Factory/.libvdpau.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvdpau", Maintainer is "sts...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libvdpau/libvdpau.changes 2012-09-13 07:02:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvdpau.new/libvdpau.changes 2013-02-04 20:53:04.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Feb 3 15:08:19 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to v0.6 + * Make use of dri2proto_CFLAGS when building. + * Fix leaked extension info on library unload + * Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER to appease + automake 1.13 + +------------------------------------------------------------------- Old: ---- libvdpau-0.5.tar.gz New: ---- libvdpau-0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvdpau.spec ++++++ --- /var/tmp/diff_new_pack.Hanuw5/_old 2013-02-04 20:53:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Hanuw5/_new 2013-02-04 20:53:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvdpau # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libvdpau -Version: 0.5 +Version: 0.6 Release: 0 Summary: VDPAU wrapper and trace libraries License: MIT ++++++ libvdpau-0.5.tar.gz -> libvdpau-0.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/AUTHORS new/libvdpau-0.6/AUTHORS --- old/libvdpau-0.5/AUTHORS 2012-09-04 19:26:33.000000000 +0200 +++ new/libvdpau-0.6/AUTHORS 2013-02-02 00:34:58.000000000 +0100 @@ -2,3 +2,5 @@ Aaron Plattner Anssi Hannula Kiran Pawar +James Le Cuirot +Robert Morell diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/ChangeLog new/libvdpau-0.6/ChangeLog --- old/libvdpau-0.5/ChangeLog 2012-09-04 19:29:09.000000000 +0200 +++ new/libvdpau-0.6/ChangeLog 2013-02-02 00:37:44.000000000 +0100 @@ -1,3 +1,85 @@ +commit 5a5969684bdfeca3bd0dd9b21c1da406b225dab1 +Author: Aaron Plattner <aplatt...@nvidia.com> +Date: Fri Feb 1 15:34:34 2013 -0800 + + Bump version to 0.6 + + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + +commit d00042fdb33ba4c2a263fef65254f77f18bac9c2 +Author: Aaron Plattner <aplatt...@nvidia.com> +Date: Thu Jan 24 15:06:32 2013 -0800 + + test: add a dlclose test + + Closing an X display that had a VDPAU device created on it causes a crash. + + Work around an identical libXext dlclose bug with the "Generic Event Extension" + by dlopening libXext.so.6 and leaving it open. + + Original bug discovered and fixed by Robert Morell <rmor...@nvidia.com> in + commit 3b43955c7324e1d213a3134387767722f34e2356. + + v2: Don't SKIP if creating the device fails. Just attempting to create the + device installs the DRI2 extension that causes the problem. + + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + Reviewed-by: Robert Morell <rmor...@nvidia.com> + +commit 99d6a9b2102b6098c1b7e7f5ed9222ba3db13ce6 +Author: Aaron Plattner <aplatt...@nvidia.com> +Date: Thu Jan 24 08:14:46 2013 -0600 + + Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER to appease automake 1.13 + + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + +commit 3b43955c7324e1d213a3134387767722f34e2356 +Author: Robert Morell <rmor...@nvidia.com> +Date: Tue Jan 22 13:26:56 2013 -0800 + + Fix leaked extension info on library unload + + In this sequence: + dlopen(libvdpau.so) + vdp_device_create_x11(dpy, ...) + dlclose(libvdpau.so) + XCloseDisplay(dpy) + + the process will attempt to call the address at which DRI2CloseDisplay + was previously mapped, possibly resulting in a SEGV. + + Instead of tracking displays to which we've added hooks and cleaning up + the extension on library unload or display close, simply clean up after + ourselves once we have the data we need. + + Signed-off-by: Robert Morell <rmor...@nvidia.com> + Reviewed-by: Aaron Plattner <aplatt...@nvidia.com> + Tested-by: Aaron Plattner <aplatt...@nvidia.com> + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + +commit fb5f05b0b395bdfee1808b85f673fcf901afca3f +Author: Aaron Plattner <aplatt...@nvidia.com> +Date: Thu Jan 24 08:16:46 2013 -0600 + + Change mailing list to vd...@lists.freedesktop.org + + Users should address questions there instead of to x...@lists.freedesktop.org. + + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + Acked-by: Robert Morell <rmor...@nvidia.com> + +commit 837c63d77f2cedf8345328efa9961739def47607 +Author: James Le Cuirot <ch...@aura-online.co.uk> +Date: Fri Jan 18 01:22:55 2013 -0800 + + Make use of dri2proto_CFLAGS when building. + + Signed-off-by: James Le Cuirot <ch...@aura-online.co.uk> + Reviewed-by: Robert Morell <rmor...@nvidia.com> + Reviewed-by: Aaron Plattner <aplatt...@nvidia.com> + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + commit 365566616381f7219f7fa7f603bcd4e96fad41f2 Author: Aaron Plattner <aplatt...@nvidia.com> Date: Tue Sep 4 09:32:35 2012 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/Makefile.am new/libvdpau-0.6/Makefile.am --- old/libvdpau-0.5/Makefile.am 2009-10-05 19:02:49.000000000 +0200 +++ new/libvdpau-0.6/Makefile.am 2013-01-28 23:51:16.000000000 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = doc src trace +SUBDIRS = doc src test trace pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = vdpau.pc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/Makefile.in new/libvdpau-0.6/Makefile.in --- old/libvdpau-0.5/Makefile.in 2012-09-04 19:26:40.000000000 +0200 +++ new/libvdpau-0.6/Makefile.in 2013-02-02 00:37:37.000000000 +0100 @@ -271,7 +271,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = doc src trace +SUBDIRS = doc src test trace pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = vdpau.pc EXTRA_DIST = vdpau.pc.in autogen.sh ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/aclocal.m4 new/libvdpau-0.6/aclocal.m4 --- old/libvdpau-0.5/aclocal.m4 2012-09-04 19:26:37.000000000 +0200 +++ new/libvdpau-0.6/aclocal.m4 2013-02-02 00:37:32.000000000 +0100 @@ -9182,18 +9182,6 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/configure new/libvdpau-0.6/configure --- old/libvdpau-0.5/configure 2012-09-04 19:26:38.000000000 +0200 +++ new/libvdpau-0.6/configure 2013-02-02 00:37:36.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libvdpau 0.5. +# Generated by GNU Autoconf 2.68 for libvdpau 0.6. # -# Report bugs to <x...@lists.freedesktop.org>. +# Report bugs to <vd...@lists.freedesktop.org>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -247,10 +247,10 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoc...@gnu.org and -$0: x...@lists.freedesktop.org about your system, including -$0: any error possibly output before this message. Then -$0: install a modern shell, or manually run the script -$0: under such a shell if you do have one." +$0: vd...@lists.freedesktop.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." fi exit 1 fi @@ -570,9 +570,9 @@ # Identity of this package. PACKAGE_NAME='libvdpau' PACKAGE_TARNAME='libvdpau' -PACKAGE_VERSION='0.5' -PACKAGE_STRING='libvdpau 0.5' -PACKAGE_BUGREPORT='x...@lists.freedesktop.org' +PACKAGE_VERSION='0.6' +PACKAGE_STRING='libvdpau 0.6' +PACKAGE_BUGREPORT='vd...@lists.freedesktop.org' PACKAGE_URL='' # Factoring default headers for most tests. @@ -1333,7 +1333,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libvdpau 0.5 to adapt to many kinds of systems. +\`configure' configures libvdpau 0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1403,7 +1403,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libvdpau 0.5:";; + short | recursive ) echo "Configuration of libvdpau 0.6:";; esac cat <<\_ACEOF @@ -1463,7 +1463,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <x...@lists.freedesktop.org>. +Report bugs to <vd...@lists.freedesktop.org>. _ACEOF ac_status=$? fi @@ -1526,7 +1526,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libvdpau configure 0.5 +libvdpau configure 0.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1925,7 +1925,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libvdpau $as_me 0.5, which was +It was created by libvdpau $as_me 0.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2740,7 +2740,7 @@ # Define the identity of the package. PACKAGE='libvdpau' - VERSION='0.5' + VERSION='0.6' cat >>confdefs.h <<_ACEOF @@ -15773,7 +15773,7 @@ -ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile trace/Makefile vdpau.pc" +ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile test/Makefile trace/Makefile vdpau.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16325,7 +16325,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libvdpau $as_me 0.5, which was +This file was extended by libvdpau $as_me 0.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16385,13 +16385,13 @@ Configuration commands: $config_commands -Report bugs to <x...@lists.freedesktop.org>." +Report bugs to <vd...@lists.freedesktop.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libvdpau config.status 0.5 +libvdpau config.status 0.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -16901,6 +16901,7 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "trace/Makefile") CONFIG_FILES="$CONFIG_FILES trace/Makefile" ;; "vdpau.pc") CONFIG_FILES="$CONFIG_FILES vdpau.pc" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/configure.ac new/libvdpau-0.6/configure.ac --- old/libvdpau-0.5/configure.ac 2012-09-04 19:26:33.000000000 +0200 +++ new/libvdpau-0.6/configure.ac 2013-02-02 00:33:13.000000000 +0100 @@ -1,10 +1,10 @@ AC_PREREQ(2.60) -AC_INIT(libvdpau, 0.5, [x...@lists.freedesktop.org], libvdpau) +AC_INIT(libvdpau, 0.6, [vd...@lists.freedesktop.org], libvdpau) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) # Disable static libraries by default. Use --enable-static if you really want # them. @@ -81,5 +81,6 @@ AC_OUTPUT([Makefile doc/Makefile src/Makefile + test/Makefile trace/Makefile vdpau.pc]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/src/Makefile.am new/libvdpau-0.6/src/Makefile.am --- old/libvdpau-0.5/src/Makefile.am 2012-09-04 19:26:33.000000000 +0200 +++ new/libvdpau-0.6/src/Makefile.am 2013-01-25 01:45:29.000000000 +0100 @@ -12,6 +12,8 @@ $(DRI2_SOURCES) if DRI2 + AM_CFLAGS += \ + $(dri2proto_CFLAGS) DRI2_SOURCES = \ mesa_dri2.c \ mesa_dri2.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/src/Makefile.in new/libvdpau-0.6/src/Makefile.in --- old/libvdpau-0.5/src/Makefile.in 2012-09-04 19:26:40.000000000 +0200 +++ new/libvdpau-0.6/src/Makefile.in 2013-02-02 00:37:36.000000000 +0100 @@ -36,6 +36,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@DRI2_TRUE@am__append_1 = \ +@DRI2_TRUE@ $(dri2proto_CFLAGS) + subdir = src DIST_COMMON = $(dist_libvdpausysconf_DATA) $(libvdpauinclude_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -243,13 +246,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -DVDPAU_MODULEDIR="\"$(moduledir)\"" \ - -DVDPAU_SYSCONFDIR="\"$(sysconfdir)\"" \ - $(X11_CFLAGS) \ - $(XEXT_CFLAGS) - +AM_CFLAGS = -I$(top_srcdir)/include \ + -DVDPAU_MODULEDIR="\"$(moduledir)\"" \ + -DVDPAU_SYSCONFDIR="\"$(sysconfdir)\"" $(X11_CFLAGS) \ + $(XEXT_CFLAGS) $(am__append_1) lib_LTLIBRARIES = libvdpau.la libvdpau_la_SOURCES = \ vdpau_wrapper.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/src/mesa_dri2.c new/libvdpau-0.6/src/mesa_dri2.c --- old/libvdpau-0.5/src/mesa_dri2.c 2010-01-28 18:45:59.000000000 +0100 +++ new/libvdpau-0.6/src/mesa_dri2.c 2013-01-25 01:55:06.000000000 +0100 @@ -42,7 +42,6 @@ static char dri2ExtensionName[] = DRI2_NAME; static XExtensionInfo *dri2Info; -static XEXT_GENERATE_CLOSE_DISPLAY (DRI2CloseDisplay, dri2Info) static /* const */ XExtensionHooks dri2ExtensionHooks = { NULL, /* create_gc */ @@ -51,7 +50,7 @@ NULL, /* free_gc */ NULL, /* create_font */ NULL, /* free_font */ - DRI2CloseDisplay, /* close_display */ + NULL, /* close_display */ NULL, /* wire_to_event */ NULL, /* event_to_wire */ NULL, /* error */ @@ -75,6 +74,14 @@ return True; } + if (dri2Info) { + if (info) { + XextRemoveDisplay(dri2Info, dpy); + } + XextDestroyExtension(dri2Info); + dri2Info = NULL; + } + return False; } @@ -161,3 +168,11 @@ return True; } + +void +_vdp_DRI2RemoveExtension(Display * dpy) +{ + XextRemoveDisplay(dri2Info, dpy); + XextDestroyExtension(dri2Info); + dri2Info = NULL; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/src/mesa_dri2.h new/libvdpau-0.6/src/mesa_dri2.h --- old/libvdpau-0.5/src/mesa_dri2.h 2010-01-28 18:45:59.000000000 +0100 +++ new/libvdpau-0.6/src/mesa_dri2.h 2013-01-25 01:55:06.000000000 +0100 @@ -47,4 +47,7 @@ _vdp_DRI2Connect(Display * display, XID window, char **driverName, char **deviceName); +extern void +_vdp_DRI2RemoveExtension(Display * display); + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/src/vdpau_wrapper.c new/libvdpau-0.6/src/vdpau_wrapper.c --- old/libvdpau-0.5/src/vdpau_wrapper.c 2012-09-04 19:26:33.000000000 +0200 +++ new/libvdpau-0.6/src/vdpau_wrapper.c 2013-01-25 01:55:06.000000000 +0100 @@ -86,14 +86,17 @@ if (!_vdp_DRI2QueryVersion(display, &major, &minor) || (major < 1 || (major == 1 && minor < 2))) { + _vdp_DRI2RemoveExtension(display); return NULL; } if (!_vdp_DRI2Connect(display, root, &driver_name, &device_name)) { + _vdp_DRI2RemoveExtension(display); return NULL; } XFree(device_name); + _vdp_DRI2RemoveExtension(display); #endif /* DRI2 */ return driver_name; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/test/Makefile.am new/libvdpau-0.6/test/Makefile.am --- old/libvdpau-0.5/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/libvdpau-0.6/test/Makefile.am 2013-01-28 23:51:16.000000000 +0100 @@ -0,0 +1,6 @@ +AM_CPPFLAGS = -I$(top_srcdir)/include +CFLAGS = $(X11_CFLAGS) +dlclose_LDADD = $(DLOPEN_LIBS) $(X11_LIBS) + +TESTS = dlclose +check_PROGRAMS = $(TESTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/test/Makefile.in new/libvdpau-0.6/test/Makefile.in --- old/libvdpau-0.5/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libvdpau-0.6/test/Makefile.in 2013-02-02 00:37:36.000000000 +0100 @@ -0,0 +1,594 @@ +# Makefile.in generated by automake 1.11.3 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +TESTS = dlclose$(EXEEXT) +check_PROGRAMS = $(am__EXEEXT_1) +subdir = test +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__EXEEXT_1 = dlclose$(EXEEXT) +dlclose_SOURCES = dlclose.c +dlclose_OBJECTS = dlclose.$(OBJEXT) +am__DEPENDENCIES_1 = +dlclose_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = dlclose.c +DIST_SOURCES = dlclose.c +ETAGS = etags +CTAGS = ctags +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = $(X11_CFLAGS) +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DLOPEN_LIBS = @DLOPEN_LIBS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFTEX = @PDFTEX@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +X11_CFLAGS = @X11_CFLAGS@ +X11_LIBS = @X11_LIBS@ +XEXT_CFLAGS = @XEXT_CFLAGS@ +XEXT_LIBS = @XEXT_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ +docdir = @docdir@ +dri2proto_CFLAGS = @dri2proto_CFLAGS@ +dri2proto_LIBS = @dri2proto_LIBS@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CPPFLAGS = -I$(top_srcdir)/include +dlclose_LDADD = $(DLOPEN_LIBS) $(X11_LIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign test/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +dlclose$(EXEEXT): $(dlclose_OBJECTS) $(dlclose_DEPENDENCIES) $(EXTRA_dlclose_DEPENDENCIES) + @rm -f dlclose$(EXEEXT) + $(LINK) $(dlclose_OBJECTS) $(dlclose_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlclose.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + col=$$red; res=XPASS; \ + ;; \ + *) \ + col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + col=$$blu; res=SKIP; \ + fi; \ + echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="$$All$$all $$tests passed"; \ + else \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all $$tests failed"; \ + else \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + if test "$$failed" -eq 0; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + fi; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ + test "$$failed" -eq 0; \ + else :; fi + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: check-am install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvdpau-0.5/test/dlclose.c new/libvdpau-0.6/test/dlclose.c --- old/libvdpau-0.5/test/dlclose.c 1970-01-01 01:00:00.000000000 +0100 +++ new/libvdpau-0.6/test/dlclose.c 2013-01-28 23:51:16.000000000 +0100 @@ -0,0 +1,64 @@ +#include <dlfcn.h> +#include <stdio.h> +#include <vdpau/vdpau.h> +#include <vdpau/vdpau_x11.h> +#include <X11/Xlib.h> + +#define PASS 0 +#define FAIL 1 +#define SKIP 77 + +int main() +{ + // Work around a bug in libXext: dlclosing it after it has registered the + // Generic Event Extension causes an identical bug to the one this program + // is trying to test for. + void *libXext = dlopen("libXext.so.6", RTLD_LAZY); + void *libvdpau = dlopen("../src/.libs/libvdpau.so", RTLD_LAZY); + Display *dpy = XOpenDisplay(NULL); + VdpDeviceCreateX11 *pvdp_device_create_x11; + VdpDevice device; + VdpGetProcAddress *get_proc_address; + VdpStatus status; + + if (!libXext) { + fprintf(stderr, "Failed to open libXext.so.6: %s", dlerror()); + return SKIP; + } + + if (!libvdpau) { + fprintf(stderr, "Failed to open libvdpau.so: %s", dlerror()); + return FAIL; + } + + if (!dpy) { + fprintf(stderr, "Failed to connect to X display %s\n", XDisplayName(NULL)); + return SKIP; + } + + pvdp_device_create_x11 = dlsym(libvdpau, "vdp_device_create_x11"); + if (!pvdp_device_create_x11) { + fprintf(stderr, "Failed to find the symbol vdp_device_create_x11\n"); + return FAIL; + } + + status = pvdp_device_create_x11(dpy, 0, &device, &get_proc_address); + if (status == VDP_STATUS_OK) { + // It's okay if creating the device fails. This will still install the + // DRI2 extension in libX11 and trigger the bug. + VdpDeviceDestroy *pvdp_device_destroy; + + status = get_proc_address(device, VDP_FUNC_ID_DEVICE_DESTROY, (void**)&pvdp_device_destroy); + if (status != VDP_STATUS_OK) { + fprintf(stderr, "Failed to find the VdpDeviceDestroy function: %d\n", status); + return FAIL; + } + + pvdp_device_destroy(device); + } + + dlclose(libvdpau); + XCloseDisplay(dpy); + + return PASS; +} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org