rpms/HelixPlayer/devel HelixPlayer-1.0.7-ogg.patch, NONE, 1.1 HelixPlayer.spec, 1.1, 1.2

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/HelixPlayer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28625/devel

Modified Files:
	HelixPlayer.spec 
Added Files:
	HelixPlayer-1.0.7-ogg.patch 
Log Message:
apply patch for ogg/vorbis (bug 218896)

HelixPlayer-1.0.7-ogg.patch:

--- NEW FILE HelixPlayer-1.0.7-ogg.patch ---
Index: datatype/ogg/fileformat/unix.pcf
===================================================================
RCS file: /cvsroot/xiph/oggff/unix.pcf,v
retrieving revision 1.2
diff -u -p -r1.2 unix.pcf
--- datatype/ogg/fileformat/unix.pcf    10 Sep 2003 20:21:27 -0000  1.2
+++ datatype/ogg/fileformat/unix.pcf    8 Dec 2006 11:05:39 -0000
@@ -1,3 +1 @@
-
-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a"))
-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libvorbis.a"))
+project.AddDynamicLibraries("-logg -lvorbis")
Index: datatype/vorbis/renderer/unix.pcf
===================================================================
RCS file: /cvsroot/xiph/vorbisrend/unix.pcf,v
retrieving revision 1.2
diff -u -p -r1.2 unix.pcf
--- datatype/vorbis/renderer/unix.pcf   10 Sep 2003 20:20:58 -0000  1.2
+++ datatype/vorbis/renderer/unix.pcf   8 Dec 2006 11:07:03 -0000
@@ -1,3 +1 @@
-
-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a"))
-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libvorbis.a"))
+project.AddDynamicLibraries("-logg -lvorbis")
Index: datatype/theora/renderer/linux2.pcf
===================================================================
RCS file: /cvsroot/xiph/theorarend/linux2.pcf,v
retrieving revision 1.2
diff -u -p -r1.2 linux2.pcf
--- datatype/theora/renderer/linux2.pcf 9 Jul 2004 18:31:54 -0000   1.2
+++ datatype/theora/renderer/linux2.pcf 8 Dec 2006 11:07:33 -0000
@@ -52,8 +52,8 @@
 UmakefileVersion(2,1)
 
 oggLibPath = os.path.join(GetSDKPath("oggvorbissdk"), "lib")
+#project.AddLibraries(os.path.join(oggLibPath, "libogg.a"),
+#                     os.path.join(oggLibPath, "libtheora.a"))
 
-project.AddLibraries(os.path.join(oggLibPath, "libogg.a"),
-                     os.path.join(oggLibPath, "libtheora.a"))
-
-project.AddSystemLibraries("pthread")
\ No newline at end of file
+project.AddDynamicLibraries("-logg -ltheora")
+project.AddSystemLibraries("pthread")


Index: HelixPlayer.spec
===================================================================
RCS file: /cvs/extras/rpms/HelixPlayer/devel/HelixPlayer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelixPlayer.spec	29 Sep 2006 13:28:09 -0000	1.1
+++ HelixPlayer.spec	8 Dec 2006 22:07:40 -0000	1.2
@@ -2,7 +2,7 @@
 Name:		HelixPlayer
 Version:	1.0.7
 Epoch:		1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Applications/Multimedia
 License:	RPSL, GPL
 URL:		https://player.helixcommunity.org/
@@ -16,6 +16,7 @@
 Patch1:		%{name}-1.0.3-disable-asm.patch
 Patch2:		hxplay-1.0.4-nptl.patch
 Patch3:		%{name}-1.0.5-missing-header.patch
+Patch4:     HelixPlayer-1.0.7-ogg.patch
 
 BuildRequires:	libtheora-devel >= 1.0alpha3-3
 BuildRequires:	libvorbis-devel
@@ -54,6 +55,7 @@
 %patch1 -p1 -b .disable-asm
 %patch2 -p1 -b .nptl
 %patch3 -p1 -b .missing-header
+%patch4 -p0 -b .ogg
 
 %build
 # Change hxplay_gtk_release to whatever string is in the Makefile
@@ -192,6 +194,9 @@
 
 
 %changelog
+* Fri Dec 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1:1.0.7-5
+- add patch to make ogg/vorbis work (bug 218896)
+
 * Thu Sep 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1:1.0.7-4
 - fixes from bug 201006 comment 20