packages: lyricue/lyricue-clutter.patch, lyricue/lyricue.spec - Up to 3.0.3...

caleb caleb at pld-linux.org
Sat Jul 23 11:53:02 CEST 2011 

Author: caleb                        Date: Sat Jul 23 09:53:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Up to 3.0.39
- Updated patch, some parts integrated upstream

---- Files affected:
packages/lyricue:
   lyricue-clutter.patch (1.2 -> 1.3) , lyricue.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: packages/lyricue/lyricue-clutter.patch
diff -u packages/lyricue/lyricue-clutter.patch:1.2 packages/lyricue/lyricue-clutter.patch:1.3
--- packages/lyricue/lyricue-clutter.patch:1.2	Tue Jun 21 19:54:08 2011
+++ packages/lyricue/lyricue-clutter.patch	Sat Jul 23 11:52:57 2011
@@ -1,72 +1,97 @@
---- lyricue-3.0.25/configure~	2010-10-10 02:23:43.000000000 +0300
-+++ lyricue-3.0.25/configure	2011-06-21 18:39:15.000000000 +0300
-@@ -13331,12 +13331,12 @@
+--- configure~	2011-07-11 02:08:00.000000000 +0300
++++ configure	2011-07-23 12:39:53.000000000 +0300
+@@ -13347,12 +13347,12 @@
      pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0") 2>&5
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 clutter-gtk-0.10\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gtk-0.10") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 clutter-gtk-1.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gtk-1.0") 2>&5
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
--  pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10" 2>/dev/null`
-+  pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0" 2>/dev/null`
+-  pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 clutter-gtk-0.10" 2>/dev/null`
++  pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 clutter-gtk-1.0" 2>/dev/null`
  else
    pkg_failed=yes
  fi
-@@ -13347,12 +13347,12 @@
+@@ -13363,12 +13363,12 @@
      pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0") 2>&5
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 clutter-gtk-0.10\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gtk-0.10") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 clutter-gtk-1.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gtk-1.0") 2>&5
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
--  pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10" 2>/dev/null`
-+  pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0" 2>/dev/null`
+-  pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 clutter-gtk-0.10" 2>/dev/null`
++  pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 clutter-gtk-1.0" 2>/dev/null`
  else
    pkg_failed=yes
  fi
-@@ -13372,14 +13372,14 @@
+@@ -13388,14 +13388,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
--	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10" 2>&1`
-+	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0" 2>&1`
+-	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-1.0 clutter-gtk-0.10" 2>&1`
++	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-1.0 clutter-gtk-1.0" 2>&1`
          else
--	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10" 2>&1`
-+	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0" 2>&1`
+-	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-1.0 clutter-gtk-0.10" 2>&1`
++	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-1.0 clutter-gtk-1.0" 2>&1`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$CLUTTER_PKG_ERRORS" >&5
  
--	as_fn_error $? "Package requirements (clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10) were not met:
-+	as_fn_error $? "Package requirements (clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0) were not met:
+-	as_fn_error $? "Package requirements (clutter-1.0 clutter-gtk-0.10) were not met:
++	as_fn_error $? "Package requirements (clutter-1.0 clutter-gtk-1.0) were not met:
  
  $CLUTTER_PKG_ERRORS
  
---- lyricue-3.0.25/src/display.c~	2010-12-12 08:18:17.000000000 +0200
-+++ lyricue-3.0.25/src/display.c	2011-06-21 19:14:14.000000000 +0300
-@@ -586,7 +586,7 @@
-             bg_is_video = g_timeout_add_seconds(1, (GSourceFunc) update_tracker, NULL);
-             video_loop = loop;
-             //gboolean ret = gst_element_seek_simple(clutter_gst_video_texture_get_playbin(CLUTTER_GST_VIDEO_TEXTURE(background)), gst_format_get_by_nick("title"), GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, 1);
--        gst_element_seek(clutter_gst_video_texture_get_playbin(CLUTTER_GST_VIDEO_TEXTURE(background)), 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, 10 * GST_SECOND, 0,0);
-+        gst_element_seek(clutter_gst_video_texture_get_pipeline(CLUTTER_GST_VIDEO_TEXTURE(background)), 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, 10 * GST_SECOND, 0,0);
- 
-         } else {
-             clutter_media_set_playing (CLUTTER_MEDIA (background), TRUE);
-@@ -852,7 +852,7 @@
- {
-     if (bg_is_video) {
-         l_debug("Skipping to %d",duration);
--        gst_element_seek(clutter_gst_video_texture_get_playbin(CLUTTER_GST_VIDEO_TEXTURE(background)), 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, duration * GST_SECOND, 0,0);
-+        gst_element_seek(clutter_gst_video_texture_get_pipeline(CLUTTER_GST_VIDEO_TEXTURE(background)), 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, duration * GST_SECOND, 0,0);
-     }
- }
+@@ -13436,12 +13436,12 @@
+     pkg_cv_CLUTTERGST_CFLAGS="$CLUTTERGST_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gst-0.10\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "clutter-gst-0.10") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gst-1.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "clutter-gst-1.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_CLUTTERGST_CFLAGS=`$PKG_CONFIG --cflags "clutter-gst-0.10" 2>/dev/null`
++  pkg_cv_CLUTTERGST_CFLAGS=`$PKG_CONFIG --cflags "clutter-gst-1.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -13452,12 +13452,12 @@
+     pkg_cv_CLUTTERGST_LIBS="$CLUTTERGST_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gst-0.10\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "clutter-gst-0.10") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gst-1.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "clutter-gst-1.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_CLUTTERGST_LIBS=`$PKG_CONFIG --libs "clutter-gst-0.10" 2>/dev/null`
++  pkg_cv_CLUTTERGST_LIBS=`$PKG_CONFIG --libs "clutter-gst-1.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -13477,9 +13477,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-gst-0.10" 2>&1`
++	        CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-gst-1.0" 2>&1`
+         else
+-	        CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-gst-0.10" 2>&1`
++	        CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-gst-1.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CLUTTERGST_PKG_ERRORS" >&5
  

================================================================
Index: packages/lyricue/lyricue.spec
diff -u packages/lyricue/lyricue.spec:1.39 packages/lyricue/lyricue.spec:1.40
--- packages/lyricue/lyricue.spec:1.39	Tue Jun 21 19:54:08 2011
+++ packages/lyricue/lyricue.spec	Sat Jul 23 11:52:57 2011
@@ -2,23 +2,23 @@
 %include    /usr/lib/rpm/macros.perl
 Summary:	GNU Lyric Display System, client interface
 Name:		lyricue
-Version:	3.0.25
-Release:	2
+Version:	3.0.39
+Release:	1
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://www.lyricue.org/archive/%{name}_%{version}.tar.gz
-# Source0-md5:	d7184f8243a9e4e8e4d3a699e6ceadce
+# Source0-md5:	35bd4c561f4f71ad1e7ea597f6260883
 URL:		http://www.lyricue.org
 Patch0:		%{name}-clutter.patch
 BuildRequires:	clutter-gst-devel >= 0.10
 BuildRequires:	clutter-gtk-devel >= 0.10
 BuildRequires:	gettext-devel
+BuildRequires:	gtk+2-devel
 BuildRequires:	intltool
 BuildRequires:	mysql-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-perlprov
 BuildRequires:	sed >= 4.0
-BuildRequires:	gtk+2-devel
 Requires:	%{name}-display = %{version}-%{release}
 Requires:	%{name}-remote = %{version}-%{release}
 Requires:	clutter-gst >= 0.10
@@ -63,7 +63,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 
 # Fix perl shebang
 %{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' src/%{name} src/%{name}_remote
@@ -109,6 +109,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2011/07/23 09:52:57  caleb
+- Up to 3.0.39
+- Updated patch, some parts integrated upstream
+
 Revision 1.39  2011/06/21 17:54:08  caleb
 - Finished patch for compiling with latest clutter-gst, clutter_gst_video_texture_get_playbin() has become clutter_gst_video_texture_get_pipeline()
 - Rel 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lyricue/lyricue-clutter.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lyricue/lyricue.spec?r1=1.39&r2=1.40&f=u

More information about the pld-cvs-commit mailing list