rpms/gxine/devel gxine-0.5.905-dso.patch, NONE, 1.1 gxine.spec, 1.34, 1.35

Martin Sourada mso at fedoraproject.org
Sat Feb 13 21:12:39 UTC 2010


Author: mso

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

Modified Files:
	gxine.spec 
Added Files:
	gxine-0.5.905-dso.patch 
Log Message:


first attempt to fix build



gxine-0.5.905-dso.patch:
 Makefile.am |    3 ++-
 Makefile.in |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE gxine-0.5.905-dso.patch ---
diff -up gxine-0.5.905/src/Makefile.am.dso gxine-0.5.905/src/Makefile.am
--- gxine-0.5.905/src/Makefile.am.dso	2010-02-13 21:54:02.000000000 +0100
+++ gxine-0.5.905/src/Makefile.am	2010-02-13 21:54:08.000000000 +0100
@@ -51,7 +51,8 @@ gxine_SOURCES = \
 gxine_LDADD = $(XINE_LIBS) $(GTK2_LIBS) $(GTHREAD2_LIBS) \
 	      $(JS_LIBS) $(HAL_LIBS) $(UDEV_LIBS) $(DBUS_LIBS) $(LIRC_LIBS) \
 	      $(X_LIBS) $(X_EXTRA_LIBS) $(XEXT_LIBS) $(XTEST_LIBS) \
-	      $(XINERAMA_LIBS) $(XRANDR_LIBS) $(XCB_LIBS)
+	      $(XINERAMA_LIBS) $(XRANDR_LIBS) $(XCB_LIBS) \
+	      -lm
 
 gxine_client_SOURCES = client.c console_output.c
 
diff -up gxine-0.5.905/src/Makefile.in.dso gxine-0.5.905/src/Makefile.in
--- gxine-0.5.905/src/Makefile.in.dso	2010-02-13 21:54:30.000000000 +0100
+++ gxine-0.5.905/src/Makefile.in	2010-02-13 21:55:07.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -217,7 +217,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PANGO_CFLAGS = @PANGO_CFLAGS@
 PANGO_LIBS = @PANGO_LIBS@
@@ -355,7 +354,8 @@ gxine_SOURCES = \
 gxine_LDADD = $(XINE_LIBS) $(GTK2_LIBS) $(GTHREAD2_LIBS) \
 	      $(JS_LIBS) $(HAL_LIBS) $(UDEV_LIBS) $(DBUS_LIBS) $(LIRC_LIBS) \
 	      $(X_LIBS) $(X_EXTRA_LIBS) $(XEXT_LIBS) $(XTEST_LIBS) \
-	      $(XINERAMA_LIBS) $(XRANDR_LIBS) $(XCB_LIBS)
+	      $(XINERAMA_LIBS) $(XRANDR_LIBS) $(XCB_LIBS) \
+	      -lm
 
 gxine_client_SOURCES = client.c console_output.c
 gxine_client_CFLAGS = $(AM_CFLAGS) -DGXINE_CLIENT


Index: gxine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxine/devel/gxine.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- gxine.spec	10 Jan 2010 20:56:42 -0000	1.34
+++ gxine.spec	13 Feb 2010 21:12:39 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           gxine
 Version:        0.5.905
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -13,6 +13,7 @@ Patch1:         gxine-0.5.902-non-separa
 Patch2:         gxine-0.5.905-desktop.patch
 # some multilib issues
 Patch3:         gxine-0.5.905-lirc.patch
+Patch4:         gxine-0.5.905-dso.patch
 
 BuildRequires:  gecko-devel
 BuildRequires:  desktop-file-utils
@@ -53,6 +54,7 @@ This plugin allows gxine to be embedded 
 %patch1 -p1 -b .non-separate-toolbar
 %patch2 -p1 -b .desktop
 %patch3 -p1 -b .lirc
+%patch4 -p1 -b .dso
 
 %{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop.in
 %{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop.in
@@ -119,6 +121,10 @@ touch --no-create %{_datadir}/icons/hico
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Sat Feb 13 2010 Martin Sourada <mso at fedoraproject.org> - 0.5.905-3
+- Fix build on devel
+- http://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
+
 * Sun Jan 10 2010 Martin Sourada <mso at fedoraproject.org> - 0.5.905-2
 - Fix source URL
 



More information about the scm-commits mailing list