rpms/gavl/devel gavl-1.1.1-system_libgdither.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gavl.spec, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 gavl-1.1.0-system_libgdither.patch, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/pkgs/rpms/gavl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23166/devel

Modified Files:
	.cvsignore gavl.spec import.log sources 
Added Files:
	gavl-1.1.1-system_libgdither.patch 
Removed Files:
	gavl-1.1.0-system_libgdither.patch 
Log Message:
Update to 1.1.1


gavl-1.1.1-system_libgdither.patch:
 configure.ac     |   21 +++++++++++++++++++++
 gavl/Makefile.am |   11 +++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

--- NEW FILE gavl-1.1.1-system_libgdither.patch ---
diff -up gavl-1.1.1/configure.ac.gdither gavl-1.1.1/configure.ac
--- gavl-1.1.1/configure.ac.gdither	2009-07-13 22:42:38.000000000 +0200
+++ gavl-1.1.1/configure.ac	2009-10-28 00:02:31.461428785 +0100
@@ -217,6 +217,27 @@ TOP_SRCDIR=`cd ${srcdir} && pwd` 
 AC_SUBST(TOP_SRCDIR)
 
 dnl
+dnl System libraries
+dnl
+
+AC_ARG_ENABLE(libgdither,
+  [  --enable-libgdither	System libgdither (experimental)])
+if test "${enable_libgdither}" = "yes"
+then
+  PKG_CHECK_MODULES(LIBGDITHER, libgdither,
+    [
+      AC_DEFINE(HAVE_LIBGDITHER, 1, [Define to 1 if you have the `libgdither' library (-lgdither).])
+      have_libgdither="true"
+    ],
+    [
+      have_libgdither="false"
+    ]
+  )
+fi
+AM_CONDITIONAL(HAVE_LIBGDITHER, [test x$have_libgdither = xtrue])
+
+
+dnl
 dnl Output variables
 dnl
 
diff -up gavl-1.1.1/gavl/Makefile.am.gdither gavl-1.1.1/gavl/Makefile.am
--- gavl-1.1.1/gavl/Makefile.am.gdither	2009-05-13 17:10:37.000000000 +0200
+++ gavl-1.1.1/gavl/Makefile.am	2009-10-28 00:04:37.837435280 +0100
@@ -40,8 +40,15 @@ threednow_libs = 
 threednow_subdirs =
 endif
 
+if HAVE_LIBGDITHER
+  MAYBE_LIBGDITHER_LA = @LIBGDITHER_LIBS@
+else
+  MAYBE_LIBGDITHER = libgdither
+  MAYBE_LIBGDITHER_LA = libgdither/libgdither.la
+endif
+
 
-SUBDIRS = hq c libgdither libsamplerate $(mmx_subdirs) \
+SUBDIRS = hq c $(MAYBE_LIBGDITHER) libsamplerate $(mmx_subdirs) \
 $(sse_subdirs) \
 $(sse2_subdirs) \
 $(sse3_subdirs) \
@@ -109,7 +116,7 @@ $(sse3_libs) \
 $(threednow_libs) \
 c/libgavl_c.la \
 hq/libgavl_hq.la \
-libgdither/libgdither.la \
+$(MAYBE_LIBGDITHER_LA) \
 libsamplerate/libsamplerate.la \
 @LIBGAVL_LIBS@ \
 -lm


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Apr 2009 10:49:10 -0000	1.2
+++ .cvsignore	27 Oct 2009 23:08:17 -0000	1.3
@@ -1 +1 @@
-gavl-1.1.0.tar.gz
+gavl-1.1.1.tar.gz


Index: gavl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/gavl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gavl.spec	24 Jul 2009 23:32:40 -0000	1.2
+++ gavl.spec	27 Oct 2009 23:08:17 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           gavl
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A library for handling uncompressed audio and video data
 
 Group:          System Environment/Libraries
 License:        GPLv3+
 URL:            http://gmerlin.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/gmerlin/gavl-%{version}.tar.gz
-Patch1:         gavl-1.1.0-system_libgdither.patch
+Patch1:         gavl-1.1.1-system_libgdither.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -55,6 +55,7 @@ sed -i -i 's/LQT_OPT_CFLAGS/dnl LQT_OPT_
 sh autogen.sh
 
 
+
 %build
 %configure \
   --enable-debug \


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	8 Apr 2009 10:49:10 -0000	1.1
+++ import.log	27 Oct 2009 23:08:18 -0000	1.2
@@ -1 +1,2 @@
 gavl-1_1_0-1_fc10:HEAD:gavl-1.1.0-1.fc10.src.rpm:1239187747
+gavl-1_1_1-1_fc11:HEAD:gavl-1.1.1-1.fc11.src.rpm:1256684797


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Apr 2009 10:49:10 -0000	1.2
+++ sources	27 Oct 2009 23:08:18 -0000	1.3
@@ -1 +1 @@
-8a631a3468f4fd4213c4ec57d1795e14  gavl-1.1.0.tar.gz
+dc37718ab20ed6728eb9e10d5bb3ad17  gavl-1.1.1.tar.gz


--- gavl-1.1.0-system_libgdither.patch DELETED ---