rpms/kino/devel kino-1.3.4-dso.patch, NONE, 1.1 kino.spec, 1.13, 1.14 kino-udev.patch, 1.1, NONE

[Dan Horák]

Author: sharkcz

Update of /cvs/free/rpms/kino/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17183

Modified Files:
	kino.spec 
Added Files:
	kino-1.3.4-dso.patch 
Removed Files:
	kino-udev.patch 
Log Message:
* Thu Jul  8 2010 Dan Horák <dan at danny.cz> - 1.3.4-3
- drop the udev rules patch
- fix linking with --no-add-needed
- add few missing BR:


kino-1.3.4-dso.patch:
 configure    |   16 ++++++++--------
 configure.in |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE kino-1.3.4-dso.patch ---
diff -up kino-1.3.4/configure.dso kino-1.3.4/configure
--- kino-1.3.4/configure.dso	2010-07-08 09:17:05.000000000 +0200
+++ kino-1.3.4/configure	2010-07-08 09:19:40.000000000 +0200
@@ -17436,12 +17436,12 @@ if test -n "$AVCODEC_CFLAGS"; then
     pkg_cv_AVCODEC_CFLAGS="$AVCODEC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavformat") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat libavcodec libavutil\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavformat libavcodec libavutil") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "libavformat" 2>/dev/null`
+  pkg_cv_AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "libavformat libavcodec libavutil" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -17452,12 +17452,12 @@ if test -n "$AVCODEC_LIBS"; then
     pkg_cv_AVCODEC_LIBS="$AVCODEC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavformat") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat libavcodec libavutil\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavformat libavcodec libavutil") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavformat" 2>/dev/null`
+  pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavformat libavcodec libavutil" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -17475,9 +17475,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        AVCODEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat" 2>&1`
+	        AVCODEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat libavcodec libavutil" 2>&1`
         else
-	        AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat" 2>&1`
+	        AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformatt libavcodec libavutil" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AVCODEC_PKG_ERRORS" >&5
diff -up kino-1.3.4/configure.in.dso kino-1.3.4/configure.in
--- kino-1.3.4/configure.in.dso	2010-07-08 09:17:09.000000000 +0200
+++ kino-1.3.4/configure.in	2010-07-08 09:17:34.000000000 +0200
@@ -221,7 +221,7 @@ if test x$with_libdv_only != xyes ; then
 		if (test "x$avcodec_include" != x) || (test "x$avcodec_lib" != x) ; then
 			local_legacy_ffmpeg_test
 		else
-			PKG_CHECK_MODULES(AVCODEC, libavformat,
+			PKG_CHECK_MODULES(AVCODEC, [libavformat libavcodec libavutil],
 			[
 				AC_DEFINE(HAVE_LIBAVCODEC, 1, [Enable FFMPEG libavcodec])
 				AC_SUBST(AVCODEC_LIBS)


Index: kino.spec
===================================================================
RCS file: /cvs/free/rpms/kino/devel/kino.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kino.spec	23 Oct 2009 06:55:55 -0000	1.13
+++ kino.spec	8 Jul 2010 08:41:09 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           kino
 Version:        1.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Kino is a non-linear DV editor for GNU/Linux
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.kinodv.org
 Source0:        http://downloads.sourceforge.net/kino/kino-%{version}.tar.gz
-Patch0:         %{name}-udev.patch
+Patch0:         %{name}-1.3.4-dso.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel
@@ -26,6 +26,9 @@
 BuildRequires: zlib-devel
 BuildRequires: gettext intltool
 BuildRequires: perl(XML::Parser)
+BuildRequires: libICE-devel
+BuildRequires: libSM-devel
+BuildRequires: alsa-lib-devel
 
 Requires: ffmpeg
 Requires: mjpegtools
@@ -53,7 +56,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .udev
+%patch0 -p1 -b .dso
 
 
 %build
@@ -109,6 +112,11 @@
 
 
 %changelog
+* Thu Jul  8 2010 Dan Horák <dan at danny.cz> - 1.3.4-3
+- drop the udev rules patch
+- fix linking with --no-add-needed
+- add few missing BR:
+
 * Fri Oct 23 2009 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 1.3.4-2
 - Update desktop file according to F-12 FedoraStudio feature
 


--- kino-udev.patch DELETED ---