--- gogo-2.39b.orig/quantize.nas +++ gogo-2.39b/quantize.nas @@ -1277,7 +1277,7 @@ add ecx, 64 jnz near .lp -.owari +.owari: femms ret %else --- gogo-2.39b.orig/debian/changelog +++ gogo-2.39b/debian/changelog @@ -0,0 +1,121 @@ +gogo (2.39b-7) unstable; urgency=low + + * debian/control Change arch to i386 instead of any + + -- Christian Marillat Thu, 28 Nov 2002 13:57:40 +0100 + +gogo (2.39b-6) unstable; urgency=low + + * Ok, I'm blind. Really fix the bug fixed in -4 + + -- Christian Marillat Thu, 29 Nov 2001 14:20:29 +0100 + +gogo (2.39b-5) unstable; urgency=low + + * Patch from Robert Sander to handle multiple CPUs on one system. + + -- Christian Marillat Sat, 20 Oct 2001 18:54:19 +0200 + +gogo (2.39b-4) unstable; urgency=low + + * Fix a bug in the wrapper. + + -- Christian Marillat Fri, 21 Sep 2001 10:31:06 +0200 + +gogo (2.39b-3) unstable; urgency=low + + * Remove debconf script and install a wrapper (Thanks to Laurent Bonnaud) + + -- Christian Marillat Wed, 19 Sep 2001 16:11:48 +0200 + +gogo (2.39b-2) unstable; urgency=low + + * Add support for debconf. + * Switch to debhelper V3 + + -- Christian Marillat Wed, 12 Sep 2001 16:23:39 +0200 + +gogo (2.39b-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 23 Jan 2001 11:21:19 +0100 + +gogo (2.38-1) unstable; urgency=low + + * New upstream release. + * Don't build i586 version. + * Switch to debhelper v2 + + -- Christian Marillat Wed, 15 Nov 2000 16:31:19 +0100 + +gogo (2.36-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 9 Sep 2000 18:31:26 +0200 + +gogo (2.35-1) unstable; urgency=low + + * New upstream source. + + -- Christian Marillat Sat, 6 May 2000 15:43:18 +0200 + +gogo (2.31-1) unstable; urgency=low + + * New upstream source. + + -- Christian Marillat Sun, 16 Apr 2000 01:26:30 +0200 + +gogo (2.26a-1) unstable; urgency=low + + * New upstream source. + + -- Christian Marillat Fri, 10 Mar 2000 22:55:09 +0100 + +gogo (2.25-2) unstable; urgency=low + + * Added the Build-depends field. + * Added a patche for Makefile. + + -- Christian Marillat Wed, 16 Feb 2000 15:28:57 +0100 + +gogo (2.25-1) unstable; urgency=low + + * New upstream source. + + -- Christian Marillat Wed, 16 Feb 2000 15:12:59 +0100 + +gogo (2.24c-1) unstable; urgency=low + + * New upstream source. + + -- Christian Marillat Tue, 25 Jan 2000 17:17:49 +0100 + +gogo (2.23-2) unstable; urgency=low + + * debian/copyright changed GPL location to /usr/share/doc + + -- Christian Marillat Thu, 23 Dec 1999 18:31:44 +0100 + +gogo (2.23-1) unstable; urgency=low + + * New upstream source. + + -- Christian Marillat Sun, 12 Dec 1999 14:24:30 +0100 + +gogo (2.22-1) unstable; urgency=low + + * New upstream source. + + -- Christian Marillat Tue, 9 Nov 1999 14:23:27 +0100 + +gogo (2.20-1) unstable; urgency=low + + * Initial Release. + + -- Christian Marillat Tue, 26 Oct 1999 15:47:12 +0200 + +Local variables: +mode: debian-changelog +End: --- gogo-2.39b.orig/debian/copyright +++ gogo-2.39b/debian/copyright @@ -0,0 +1,13 @@ +This is gogo, written and maintained by Christian Marillat +on Tue, 26 Oct 1999 15:47:12 +0200. + +The original source can always be found at: + ftp://ftp.debian.org/dists/unstable/main/source/ + +Copyright (C) 1999, 2000 PEN@MarineCat and shigeo + Special thanks to Keiichi SAKAI, URURI, Noisyu and Kei + + You should have received a copy of the GNU Lesser General Public License + with the Debian GNU/Linux distribution in file + /usr/share/common-licenses/LGPL; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --- gogo-2.39b.orig/debian/dirs +++ gogo-2.39b/debian/dirs @@ -0,0 +1 @@ +usr/bin --- gogo-2.39b.orig/debian/control +++ gogo-2.39b/debian/control @@ -0,0 +1,20 @@ +Source: gogo +Section: non-free/sound +Priority: optional +Maintainer: Christian Marillat +Standards-Version: 3.5.8 +Build-depends: nasm, debhelper (>= 3.0) + +Package: gogo +Architecture: i386 +Depends: ${shlibs:Depends} +Description: mp3 encoder + This package contain three binaries and a wrapper. + . + gogo.i486 for i486 CPU + . + gogo.i686 for Pentium Pro/Celeron/Pentium II/Pentium III + . + gogo.k6 for AMD K6 /K6-II/K6-III/Duron/Athlon + . + gogo the wrapper call the right binary by looking in /proc/cpuinfo --- gogo-2.39b.orig/debian/rules +++ gogo-2.39b/debian/rules @@ -0,0 +1,133 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=3 + +# Patches applied in this order. +debian_patches = + +build: patched-stamp build-stamp +build-stamp: + dh_testdir + dh_installdirs + +# i386 + $(MAKE) -j 2 CC='gcc -c -O3 -finline-functions -fomit-frame-pointer \ + -funroll-loops' + mv gogo gogo.i386 + $(MAKE) clean + +# i686 + $(MAKE) -j 2 CC='gcc -c -mcpu=pentiumpro -march=pentiumpro -O9 \ + -fstrength-reduce -fexpensive-optimizations -finline-functions \ + -fomit-frame-pointer -funroll-loops -ffast-math \ + -foptimize-register-move -fdefer-pop -mfancy-math-387' + mv gogo gogo.i686 + $(MAKE) clean + +# k6 + $(MAKE) -j 2 CC='gcc -c -mcpu=k6 -march=k6 -O9 \ + -fstrength-reduce -fexpensive-optimizations -finline-functions \ + -fomit-frame-pointer -funroll-loops -ffast-math \ + -foptimize-register-move -fdefer-pop -mfancy-math-387' + mv gogo gogo.k6 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + -$(MAKE) clean + + debian/rules reverse-patches + + dh_clean install-stamp gogo.i* gogo.k6 + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cp gogo.i* gogo.k6 debian/gogo/usr/bin + install -m 0755 debian/gogo.wrapper debian/gogo/usr/bin/gogo + + touch install-stamp + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs +# dh_undocumented + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + # You may want to make some executables suid here. +# dh_suidregister +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install + +# --------------------------------------------------------------------------- +# various rules to unpack addons and (un)apply patches. +# borrowed from egcs package + +patch_dir = debian/patches + +apply-patches: patched-stamp +reverse-patches: + @for stamp in none patched-*; do \ + case "$$stamp" in none|patched-stamp|patched-\*) continue; esac; \ + patch=`echo $$stamp | sed -e 's/patched-//'`; \ + echo "trying to revert patch $$patch ..."; \ + if [ -x $(patch_dir)/$$patch.dpatch ]; then true; else \ + chmod +x $(patch_dir)/$$patch.dpatch; fi; \ + if $(patch_dir)/$$patch.dpatch -unpatch; then \ + echo "reverted $$patch patch."; \ + rm -f $$stamp; \ + else \ + echo "error in reverting $$patch patch."; \ + exit 1; \ + fi; \ + done + rm -f patched-stamp + +patched-%: $(patch_dir)/%.dpatch + @if [ -x $< ]; then true; else chmod +x $<; fi + @if [ -f $@ ]; then \ + echo "$* patches already applied."; exit 1; \ + fi + $< -patch + @echo "$* patches applied." > $@ + +patched-stamp: $(foreach p,$(debian_patches),patched-$(p)) + @echo -e "\nPatches applied:" >> pxxx + @for i in none $(debian_patches); do \ + if [ -r debian/patches/$$i.dpatch ]; then \ + echo -e "\n$$i:" >> pxxx; \ + sed -n 's/^# *DP: */ /p' debian/patches/$$i.dpatch >> pxxx; \ + fi \ + done + mv -f pxxx patched-stamp --- gogo-2.39b.orig/debian/preinst +++ gogo-2.39b/debian/preinst @@ -0,0 +1,9 @@ +#!/bin/sh -e + +if [ -h /usr/bin/gogo ]; then + rm /usr/bin/gogo +fi + +#DEBHELPER# + +exit 0 --- gogo-2.39b.orig/debian/gogo.wrapper +++ gogo-2.39b/debian/gogo.wrapper @@ -0,0 +1,29 @@ +#!/bin/sh + +PATH=/bin:/usr/bin + +arch=`dpkg --print-installation-architecture` + +if [ $arch != "i386" ] +then # other architecture => standard binary + binary=gogo.i386 +else # x86/IA32 architecture => we select the correct binary + + binary=gogo.i386 + + cpu_family=`grep "cpu family" /proc/cpuinfo | cut -d : -f 2 | uniq` + + if [ $cpu_family -ge 6 ] + then + binary=gogo.i686 + fi + + if grep -q 3dnow /proc/cpuinfo + then + binary=gogo.k6 + fi +fi + +#echo Executing $binary + +exec /usr/bin/$binary "$@" --- gogo-2.39b.orig/debian/patches/makefile.dpatch +++ gogo-2.39b/debian/patches/makefile.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh -e + +# DP: Modified + +if [ $# -ne 1 ]; then + echo >&2 "$0: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f -p0 < $0;; + -unpatch) patch -f -R -p0 < $0;; + *) + echo >&2 "$0: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +--- Makefile.orig Tue Jan 23 11:24:58 2001 ++++ Makefile Tue Jan 23 11:25:08 2001 +@@ -33,7 +33,7 @@ + LD=gcc + #LD=gcc -Wl,-Map,gogo.map + LIBS=-lm +-CC=gcc -c -m486 -O3 -finline-functions -fomit-frame-pointer -funroll-loops ++#CC=gcc -c -m486 -O3 -finline-functions -fomit-frame-pointer -funroll-loops + # This option is available for gcc-2.8.x + #CC=gcc -c -mcpu=pentiumpro -malign-double -O6 -fstrength-reduce -fexpensive-optimizations -finline-functions -fomit-frame-pointer -funroll-loops + # This option is available for gcc-2.95.1, gcc-2.95.2, gcc-2.95.3,... on P6 or later