[packages/libtheora] - fix eambple program linking - fix building with libpng 1.6 - disable unresolved symbols check, lib

[baggins]

commit 69b7c7129a9f6c72ba152f13295d4f418c04f435
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Dec 30 17:55:27 2014 +0000

    - fix eambple program linking
    - fix building with libpng 1.6
    - disable unresolved symbols check, libriaries are interlinked in weird way

 libpng16.patch | 14 ++++++++++++++
 libtheora.spec |  8 +++++++-
 link.patch     | 11 +++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/libtheora.spec b/libtheora.spec
index 04aef8b..fdfa398 100644
--- a/libtheora.spec
+++ b/libtheora.spec
@@ -15,6 +15,8 @@ License:	BSD-like
 Group:		Libraries
 Source0:	http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.bz2
 # Source0-md5:	292ab65cedd5021d6b7ddd117e07cd8e
+Patch0:		link.patch
+Patch1:		libpng16.patch
 URL:		http://www.theora.org/
 BuildRequires:	SDL-devel
 BuildRequires:	autoconf >= 2.50
@@ -37,6 +39,8 @@ Provides:	libtheora-mmx
 Obsoletes:	libtheora-mmx
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		no_install_post_check_so	1
+
 %description
 Theora is Xiph.Org's first publicly released video codec, intended for
 use within the Ogg's project's Ogg multimedia streaming system. Theora
@@ -82,6 +86,8 @@ Statyczna biblioteka Theora.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -98,7 +104,7 @@ Statyczna biblioteka Theora.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	docdir=%{_docdir}/libtheora-docs
 
diff --git a/libpng16.patch b/libpng16.patch
new file mode 100644
index 0000000..36c05bf
--- /dev/null
+++ b/libpng16.patch
@@ -0,0 +1,14 @@
+--- libtheora-1.1.1/examples/png2theora.c~	2009-08-22 18:14:04.000000000 +0000
++++ libtheora-1.1.1/examples/png2theora.c	2014-12-30 17:19:20.795690627 +0000
+@@ -462,9 +462,9 @@
+   png_set_strip_alpha(png_ptr);
+ 
+   row_data = (png_bytep)png_malloc(png_ptr,
+-    3*height*width*png_sizeof(*row_data));
++    3*height*width*sizeof(*row_data));
+   row_pointers = (png_bytep *)png_malloc(png_ptr,
+-    height*png_sizeof(*row_pointers));
++    height*sizeof(*row_pointers));
+   for(y = 0; y < height; y++) {
+     row_pointers[y] = row_data + y*(3*width);
+   }
diff --git a/link.patch b/link.patch
new file mode 100644
index 0000000..cfc4122
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,11 @@
+--- libtheora-1.1.1/examples/Makefile.am~	2009-08-31 20:18:36.000000000 +0000
++++ libtheora-1.1.1/examples/Makefile.am	2014-12-30 17:16:19.505697021 +0000
+@@ -22,7 +22,7 @@
+ 
+ player_example_SOURCES = player_example.c
+ player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)
+-player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OSS_LIBS)
++player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OSS_LIBS) -lm
+ 
+ encoder_example_SOURCES = encoder_example.c
+ EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libtheora.git/commitdiff/69b7c7129a9f6c72ba152f13295d4f418c04f435