From 3bf49b965684ca51846e862de060161cb160bb1e Mon Sep 17 00:00:00 2001
From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 29 Jan 2006 21:26:43 +0000
Subject: upgrade libvorbis to v1.1.2, spca5xx to v20060101 and add gcc4 fix
 for shfs

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3068 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/libvorbis/Makefile                         |  4 +-
 package/libvorbis/patches/100-no_examples.patch    | 12 +++++
 .../libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch | 60 ----------------------
 3 files changed, 14 insertions(+), 62 deletions(-)
 create mode 100644 package/libvorbis/patches/100-no_examples.patch
 delete mode 100644 package/libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch

(limited to 'package/libvorbis')

diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index dc7e5e09e..204d137ec 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvorbis
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.1.2
 PKG_RELEASE:=1
-PKG_MD5SUM:=b77270c24840af4de54bea5ad1c0b252
+PKG_MD5SUM:=37847626b8e1b53ae79a34714c7b3211
 
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/vorbis/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/libvorbis/patches/100-no_examples.patch b/package/libvorbis/patches/100-no_examples.patch
new file mode 100644
index 000000000..35c50a4c5
--- /dev/null
+++ b/package/libvorbis/patches/100-no_examples.patch
@@ -0,0 +1,12 @@
+diff -ur libvorbis-1.1.2/Makefile.in libvorbis-1.1.2-owrt/Makefile.in
+--- libvorbis-1.1.2/Makefile.in	2005-11-28 06:43:44.000000000 +0100
++++ libvorbis-1.1.2-owrt/Makefile.in	2006-01-29 21:55:23.000000000 +0100
+@@ -217,7 +217,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = foreign dist-zip
+-SUBDIRS = lib include doc examples vq
++SUBDIRS = lib include doc vq
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = vorbis.m4
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/package/libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch b/package/libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch
deleted file mode 100644
index 480172fcf..000000000
--- a/package/libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Submitted By: Steffen Knollmann <sknolli at astro.physik.uni-goettingen.de>
-Date: 2005-11-09
-Initial Package Version: 1.1.1
-Upstream Status: From Upstream
-Origin: msmith, courtesy of upstream SVN
-Description: Fixes an optimization problem with gcc-4.0.x that results in
-             dysfunctional library that will produce bigger encoded files
-             with a poor audio quality. Detailed description at:
-             http://trac.xiph.org/cgi-bin/trac.cgi/ticket/583
-
-$LastChangedBy: randy $
-$Date: 2005-11-18 08:12:42 -0700 (Fri, 18 Nov 2005) $
-
-
---- libvorbis-1.1.1/lib/scales.h	(revision 9958)
-+++ libvorbis-1.1.1/lib/scales.h	(revision 9959)
-@@ -26,20 +26,24 @@
- #ifdef VORBIS_IEEE_FLOAT32
- 
- static float unitnorm(float x){
--  ogg_uint32_t *ix=(ogg_uint32_t *)&x;
--  *ix=(*ix&0x80000000UL)|(0x3f800000UL);
--  return(x);
--}
--
--static float FABS(float *x){
--  ogg_uint32_t *ix=(ogg_uint32_t *)x;
--  *ix&=0x7fffffffUL;
--  return(*x);
-+  union {
-+    ogg_uint32_t i;
-+    float f;
-+  } ix;
-+  ix.f = x;
-+  ix.i = (ix.i & 0x80000000U) | (0x3f800000U);
-+  return ix.f;
- }
- 
- /* Segher was off (too high) by ~ .3 decibel.  Center the conversion correctly. */
- static float todB(const float *x){
--  return (float)((*(ogg_int32_t *)x)&0x7fffffff) * 7.17711438e-7f -764.6161886f;
-+  union {
-+    ogg_uint32_t i;
-+    float f;
-+  } ix;
-+  ix.f = *x;
-+  ix.i = ix.i&0x7fffffff;
-+  return (float)(ix.i * 7.17711438e-7f -764.6161886f);
- }
- 
- #define todB_nn(x) todB(x)
-@@ -51,8 +55,6 @@
-   return(1.f);
- }
- 
--#define FABS(x) fabs(*(x))
--
- #define todB(x)   (*(x)==0?-400.f:log(*(x)**(x))*4.34294480f)
- #define todB_nn(x)   (*(x)==0.f?-400.f:log(*(x))*8.6858896f)
-
-- 
cgit v1.2.3