summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vorbis-tools-ac_fixes.patch32
-rw-r--r--vorbis-tools-amfix.patch102
-rw-r--r--vorbis-tools.spec13
3 files changed, 11 insertions, 136 deletions
diff --git a/vorbis-tools-ac_fixes.patch b/vorbis-tools-ac_fixes.patch
index a558cef..bdab20f 100644
--- a/vorbis-tools-ac_fixes.patch
+++ b/vorbis-tools-ac_fixes.patch
@@ -1,7 +1,6 @@
-diff -Nur vorbis-tools-1.0.orig/configure.in vorbis-tools-1.0/configure.in
---- vorbis-tools-1.0.orig/configure.in Thu Jul 11 16:10:34 2002
-+++ vorbis-tools-1.0/configure.in Sat Jul 20 17:54:52 2002
-@@ -11,11 +11,7 @@
+--- vorbis-tools-1.0.1/configure.in.orig 2003-11-22 02:13:34.000000000 +0100
++++ vorbis-tools-1.0.1/configure.in 2003-11-22 02:17:55.570777208 +0100
+@@ -16,11 +16,7 @@
dnl Check for programs
dnl --------------------------------------------------
@@ -13,11 +12,11 @@ diff -Nur vorbis-tools-1.0.orig/configure.in vorbis-tools-1.0/configure.in
AM_PROG_LIBTOOL
-@@ -28,55 +24,6 @@
+@@ -33,55 +29,6 @@
AC_CANONICAL_HOST
--casecflags_save="$CFLAGS"
+-cflags_save="$CFLAGS"
-ldflags_save="$LDFLAGS"
-if test -z "$GCC"; then
- case $host in
@@ -69,24 +68,3 @@ diff -Nur vorbis-tools-1.0.orig/configure.in vorbis-tools-1.0/configure.in
dnl --------------------------------------------------
dnl Allow tools to be selectively built
dnl --------------------------------------------------
-@@ -167,4 +114,19 @@
- AC_SUBST(I18N_CFLAGS)
- AC_SUBST(I18N_LIBS)
-
--AC_OUTPUT(Makefile intl/Makefile po/Makefile.in include/Makefile share/Makefile win32/Makefile oggdec/Makefile oggenc/Makefile oggenc/man/Makefile ogg123/Makefile vorbiscomment/Makefile vcut/Makefile ogginfo/Makefile debian/Makefile)
-+AC_OUTPUT([
-+ Makefile
-+ intl/Makefile
-+ po/Makefile.in
-+ include/Makefile
-+ share/Makefile
-+ win32/Makefile
-+ oggdec/Makefile
-+ oggenc/Makefile
-+ oggenc/man/Makefile
-+ ogg123/Makefile
-+ vorbiscomment/Makefile
-+ vcut/Makefile
-+ ogginfo/Makefile
-+ debian/Makefile
-+])
diff --git a/vorbis-tools-amfix.patch b/vorbis-tools-amfix.patch
deleted file mode 100644
index 556e08c..0000000
--- a/vorbis-tools-amfix.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -Nur vorbis-tools-1.0.orig/ogg123/Makefile.am vorbis-tools-1.0/ogg123/Makefile.am
---- vorbis-tools-1.0.orig/ogg123/Makefile.am Thu Jul 11 04:45:37 2002
-+++ vorbis-tools-1.0/ogg123/Makefile.am Tue Jul 23 07:41:27 2002
-@@ -15,12 +15,12 @@
- transport.h
-
-
--if BUILD_OGG123
-
- datadir = @datadir@
- localedir = $(datadir)/locale
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-+if BUILD_OGG123
- bin_PROGRAMS = ogg123
- docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
- mandir = @MANDIR@
-diff -Nur vorbis-tools-1.0.orig/oggdec/Makefile.am vorbis-tools-1.0/oggdec/Makefile.am
---- vorbis-tools-1.0.orig/oggdec/Makefile.am Thu Jul 11 04:45:37 2002
-+++ vorbis-tools-1.0/oggdec/Makefile.am Tue Jul 23 07:41:45 2002
-@@ -5,12 +5,12 @@
- mans = oggdec.1
- oggdecsources = oggdec.c
-
--if BUILD_OGGDEC
-
- datadir = @datadir@
- localedir = $(datadir)/locale
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-+if BUILD_OGGDEC
- bin_PROGRAMS = oggdec
-
- INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@
-diff -Nur vorbis-tools-1.0.orig/oggenc/Makefile.am vorbis-tools-1.0/oggenc/Makefile.am
---- vorbis-tools-1.0.orig/oggenc/Makefile.am Thu Jul 11 04:45:38 2002
-+++ vorbis-tools-1.0/oggenc/Makefile.am Tue Jul 23 07:42:00 2002
-@@ -7,12 +7,12 @@
- oggencsources = oggenc.c audio.c encode.c platform.c \
- audio.h encode.h platform.h resample.c resample.h
-
--if BUILD_OGGENC
-
- datadir = @datadir@
- localedir = $(datadir)/locale
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-+if BUILD_OGGENC
- bin_PROGRAMS = oggenc
-
- INCLUDES = @SHARE_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @I18N_CFLAGS@
-diff -Nur vorbis-tools-1.0.orig/ogginfo/Makefile.am vorbis-tools-1.0/ogginfo/Makefile.am
---- vorbis-tools-1.0.orig/ogginfo/Makefile.am Thu Jul 11 04:45:38 2002
-+++ vorbis-tools-1.0/ogginfo/Makefile.am Tue Jul 23 07:42:16 2002
-@@ -5,12 +5,12 @@
- mans = ogginfo.1
- ogginfosources = ogginfo2.c
-
--if BUILD_OGGINFO
-
- datadir = @datadir@
- localedir = $(datadir)/locale
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-+if BUILD_OGGINFO
- bin_PROGRAMS = ogginfo
- mandir = @MANDIR@
- man_MANS = $(mans)
-diff -Nur vorbis-tools-1.0.orig/vcut/Makefile.am vorbis-tools-1.0/vcut/Makefile.am
---- vorbis-tools-1.0.orig/vcut/Makefile.am Thu Jul 11 04:45:38 2002
-+++ vorbis-tools-1.0/vcut/Makefile.am Tue Jul 23 07:42:27 2002
-@@ -5,12 +5,12 @@
- mans = vcut.1
- vcutsources = vcut.c vcut.h
-
--if BUILD_VCUT
-
- datadir = @datadir@
- localedir = $(datadir)/locale
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-+if BUILD_VCUT
- bin_PROGRAMS = vcut
- mandir = @MANDIR@
- man_MANS = $(mans)
-diff -Nur vorbis-tools-1.0.orig/vorbiscomment/Makefile.am vorbis-tools-1.0/vorbiscomment/Makefile.am
---- vorbis-tools-1.0.orig/vorbiscomment/Makefile.am Thu Jul 11 04:45:39 2002
-+++ vorbis-tools-1.0/vorbiscomment/Makefile.am Tue Jul 23 07:42:34 2002
-@@ -5,12 +5,12 @@
- mans = vorbiscomment.1
- vorbiscommentsources = vcedit.c vcedit.h vcomment.c
-
--if BUILD_VORBISCOMMENT
-
- datadir = @datadir@
- localedir = $(datadir)/locale
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-+if BUILD_VORBISCOMMENT
- bin_PROGRAMS = vorbiscomment
- mandir = @MANDIR@
- man_MANS = $(mans)
diff --git a/vorbis-tools.spec b/vorbis-tools.spec
index d162118..9055b90 100644
--- a/vorbis-tools.spec
+++ b/vorbis-tools.spec
@@ -11,17 +11,18 @@ Group: Development/Libraries
Source0: http://www.vorbis.com/files/%{version}/unix/%{name}-%{version}.tar.gz
# Source0-md5: 80d3ae3bbae2a488d433d86b8fd64777
Patch0: %{name}-ac_fixes.patch
-Patch1: %{name}-amfix.patch
-Patch2: %{name}-nolibnsl.patch
+Patch1: %{name}-nolibnsl.patch
URL: http://www.vorbis.com/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.53
BuildRequires: automake
BuildRequires: curl-devel
+BuildRequires: flac-devel
BuildRequires: libao-devel >= 0.8.3
BuildRequires: libogg-devel >= 2:1.1
BuildRequires: libtool
BuildRequires: libvorbis-devel >= 1:1.0-6
BuildRequires: openssl-devel >= 0.9.7c
+BuildRequires: speex-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: vorbis
@@ -44,12 +45,10 @@ de alta qualidade.
%prep
%setup -q
-#%patch0 -p1
-#%patch1 -p1
-%patch2 -p1
+%patch0 -p1
+%patch1 -p1
%build
-rm -f missing
%{__libtoolize}
%{__aclocal}
%{__autoconf}
generated by cgit v0.10.2 at 2024-06-10 03:06:01 (GMT)