rpms/libtheora/devel libtheora-1.0beta3-undef-nonweak-symbols.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 libtheora.spec, 1.25, 1.26 sources, 1.8, 1.9 libtheora-1.0beta2-png2theora.patch, 1.1, NONE

Sat Apr 19 09:01:09 UTC 2008

Author: jwrdegoede

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

Modified Files:
	.cvsignore libtheora.spec sources 
Added Files:
	libtheora-1.0beta3-undef-nonweak-symbols.patch 
Removed Files:
	libtheora-1.0beta2-png2theora.patch 
Log Message:
* Thu Apr 17 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0beta3-1
- New upstream release 1.0beta3


libtheora-1.0beta3-undef-nonweak-symbols.patch:

--- NEW FILE libtheora-1.0beta3-undef-nonweak-symbols.patch ---
diff -up libtheora-1.0beta3/lib/Makefile.am.foo libtheora-1.0beta3/lib/Makefile.am
--- libtheora-1.0beta3/lib/Makefile.am.foo	2008-04-16 22:25:54.000000000 +0200
+++ libtheora-1.0beta3/lib/Makefile.am	2008-04-19 10:29:14.000000000 +0200
@@ -144,6 +144,7 @@ libtheoraenc_la_SOURCES = \
 libtheoraenc_la_LDFLAGS = \
   -version-info @THENC_LIB_CURRENT@:@THENC_LIB_REVISION@:@THENC_LIB_AGE@ \
   @THEORAENC_LDFLAGS@ $(OGG_LIBS)
+libtheoraenc_la_LIBADD = libtheora.la
 
 libtheora_la_SOURCES = \
   cpu.c \
diff -up libtheora-1.0beta3/lib/Makefile.in.foo libtheora-1.0beta3/lib/Makefile.in
--- libtheora-1.0beta3/lib/Makefile.in.foo	2008-04-16 22:26:15.000000000 +0200
+++ libtheora-1.0beta3/lib/Makefile.in	2008-04-19 10:32:32.000000000 +0200
@@ -119,7 +119,8 @@ libtheoradec_la_OBJECTS = $(am_libtheora
 libtheoradec_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libtheoradec_la_LDFLAGS) $(LDFLAGS) -o $@
-libtheoraenc_la_LIBADD =
+libtheoraenc_la_LIBADD = libtheora.la
+libtheoraenc_la_DEPENDENCIES = libtheora.la
 am__libtheoraenc_la_SOURCES_DIST = cpu.c \
 	$(enc_arch_dir)/dct_decode_mmx.c $(enc_arch_dir)/dsp_mmx.c \
 	$(enc_arch_dir)/dsp_mmxext.c $(enc_arch_dir)/recon_mmx.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtheora/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2007 14:19:40 -0000	1.8
+++ .cvsignore	19 Apr 2008 09:00:31 -0000	1.9
@@ -1 +1 @@
-libtheora-1.0beta2.tar.gz
+libtheora-1.0beta3.tar.gz


Index: libtheora.spec
===================================================================
RCS file: /cvs/extras/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libtheora.spec	19 Feb 2008 09:07:45 -0000	1.25
+++ libtheora.spec	19 Apr 2008 09:00:31 -0000	1.26
@@ -1,14 +1,14 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
-Version: 1.0beta2
-Release: 4%{?dist}
+Version: 1.0beta3
+Release: 1%{?dist}
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.theora.org
 Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.gz
 Patch1: libtheora-1.0alpha8-textreloc.patch
-Patch2: libtheora-1.0beta2-png2theora.patch
+Patch2: libtheora-1.0beta3-undef-nonweak-symbols.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: libogg-devel >= 2:1.1
 BuildRequires: libvorbis-devel
@@ -57,19 +57,24 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+# no custom CFLAGS please
+sed -i 's/CFLAGS="$CFLAGS $cflags_save"/CFLAGS="$cflags_save"/g' configure
 
 
 %build
 %configure --enable-shared --disable-static
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make
 make -C doc/spec
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -r $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
@@ -95,11 +100,11 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/libtheora/html doc/vp3-format.txt doc/spec/Theora_spec.pdf
+%doc doc/libtheora/html doc/vp3-format.txt doc/spec/Theora.pdf
 %doc doc/color.html doc/draft-ietf-avt-rtp-theora-00.txt
 %{_includedir}/theora
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/theora.pc
+%{_libdir}/pkgconfig/theora*.pc
 
 %files -n theora-tools
 %defattr(-,root,root,-)
@@ -107,6 +112,9 @@
 
 
 %changelog
+* Thu Apr 17 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0beta3-1
+- New upstream release 1.0beta3
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.0beta2-4
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtheora/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2007 14:19:40 -0000	1.8
+++ sources	19 Apr 2008 09:00:31 -0000	1.9
@@ -1 +1 @@
-8e1ee3cab4aaf61c895121d45dccaf71  libtheora-1.0beta2.tar.gz
+98fbf4a7a61486db17803e0f521f6ac8  libtheora-1.0beta3.tar.gz


--- libtheora-1.0beta2-png2theora.patch DELETED ---


