[packages/lyricue] - Up to 3.6.0 - Remove patch applied upstream
caleb
caleb at pld-linux.org
Wed Aug 28 12:28:21 CEST 2013
commit e888e7b5857350489c06b55a105cc84598dd5ed7
Author: Caleb Maclennan <caleb at pld-linux.org>
Date: Wed Aug 28 13:28:16 2013 +0300
- Up to 3.6.0
- Remove patch applied upstream
lyricue-clutter-gst.patch | 140 ----------------------------------------------
lyricue.spec | 8 +--
2 files changed, 3 insertions(+), 145 deletions(-)
---
diff --git a/lyricue.spec b/lyricue.spec
index 219e725..253351e 100644
--- a/lyricue.spec
+++ b/lyricue.spec
@@ -5,14 +5,13 @@
Summary: GNU Lyric Display System, client interface
Name: lyricue
-Version: 3.5.5
+Version: 3.6.0
Release: 1
License: GPL
Group: X11/Applications/Graphics
Source0: http://www.lyricue.org/archive/%{name}_%{version}.tar.gz
-# Source0-md5: fb32a72110c7f1dd006fbca9828dc5da
-Patch0: %{name}-clutter-gst.patch
-Patch1: %{name}-gstreamer.patch
+# Source0-md5: 9582540f0d121ebf55f78f005fb64f99
+Patch0: %{name}-gstreamer.patch
URL: http://www.lyricue.org
BuildRequires: clutter-gst-devel >= 0.10
BuildRequires: clutter-gtk-devel >= 0.10
@@ -69,7 +68,6 @@ Remote control CLI to control the projection display from any shell.
%prep
%setup -q
%patch0 -p0
-%patch1 -p0
# Fix perl shebang
%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' src/%{name} src/%{name}_remote
diff --git a/lyricue-clutter-gst.patch b/lyricue-clutter-gst.patch
deleted file mode 100644
index 8888ef2..0000000
--- a/lyricue-clutter-gst.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- configure 2012-12-21 15:36:33.366282500 +0200
-+++ configure 2012-12-21 15:36:52.769633834 +0200
-@@ -14669,12 +14669,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-2.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "clutter-gst-2.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-2.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -14686,12 +14686,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-2.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "clutter-gst-2.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-2.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -14712,14 +14712,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-gst-0.10" 2>&1`
-+ CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-gst-2.0" 2>&1`
- else
-- CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-gst-0.10" 2>&1`
-+ CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-gst-2.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$CLUTTERGST_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (clutter-gst-0.10) were not met:
-+ as_fn_error $? "Package requirements (clutter-gst-2.0) were not met:
-
- $CLUTTERGST_PKG_ERRORS
-
-@@ -14763,12 +14763,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-2.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "clutter-gst-2.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-2.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -14780,12 +14780,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-2.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "clutter-gst-2.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-2.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -14806,14 +14806,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-gst-0.10" 2>&1`
-+ CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-gst-2.0" 2>&1`
- else
-- CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-gst-0.10" 2>&1`
-+ CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-gst-2.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$CLUTTERGST_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (clutter-gst-0.10) were not met:
-+ as_fn_error $? "Package requirements (clutter-gst-2.0) were not met:
-
- $CLUTTERGST_PKG_ERRORS
-
---- src/display.c~ 2013-01-10 14:50:56.263609000 +0200
-+++ src/display.c 2013-03-19 13:28:46.486174108 +0200
-@@ -570,7 +570,7 @@
- }
- clutter_media_set_playing (CLUTTER_MEDIA (background), TRUE);
- video_loop = loop;
--#if CLUTTER_GST_MAJOR_VERSION == 1
-+#if CLUTTER_GST_MAJOR_VERSION >= 1
- GstElement *playbin =
- clutter_gst_video_texture_get_pipeline
- (CLUTTER_GST_VIDEO_TEXTURE (background));
-@@ -643,7 +643,7 @@
- }
- clutter_media_set_playing (CLUTTER_MEDIA (background), TRUE);
- video_loop = loop;
--#if CLUTTER_GST_MAJOR_VERSION == 1
-+#if CLUTTER_GST_MAJOR_VERSION >= 1
- GstElement *playbin =
- clutter_gst_video_texture_get_pipeline (CLUTTER_GST_VIDEO_TEXTURE
- (background));
-@@ -690,7 +690,7 @@
- }
- clutter_media_set_playing (CLUTTER_MEDIA (background), TRUE);
- video_loop = loop;
--#if CLUTTER_GST_MAJOR_VERSION == 1
-+#if CLUTTER_GST_MAJOR_VERSION >= 1
- GstElement *playbin =
- clutter_gst_video_texture_get_pipeline (CLUTTER_GST_VIDEO_TEXTURE
- (background));
-@@ -984,7 +984,7 @@
- {
- if (bg_is_video) {
- l_debug ("Skipping to %d", duration);
--#if CLUTTER_GST_MAJOR_VERSION == 1
-+#if CLUTTER_GST_MAJOR_VERSION >= 1
- gst_element_seek (clutter_gst_video_texture_get_pipeline
- (CLUTTER_GST_VIDEO_TEXTURE (background)), 1.0,
- GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lyricue.git/commitdiff/e888e7b5857350489c06b55a105cc84598dd5ed7
More information about the pld-cvs-commit
mailing list