diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2007-10-20 17:58:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2007-10-20 17:58:20 +0000 |
| commit | 0979c48e7c150384d9421d6f9857efa2549a4e8b (patch) | |
| tree | fef09a071573c5c39ec584b24b702830c7bc5b1b /media-sound | |
| parent | Copied valgrind-3.2.3 to 3.2.3-r1 to force upgrade to a version with a fix fo... (diff) | |
| download | historical-0979c48e7c150384d9421d6f9857efa2549a4e8b.tar.gz historical-0979c48e7c150384d9421d6f9857efa2549a4e8b.tar.bz2 historical-0979c48e7c150384d9421d6f9857efa2549a4e8b.zip | |
..to be continued.
Package-Manager: portage-2.1.3.15
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/cdparanoia/Manifest | 8 | ||||
| -rw-r--r-- | media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch | 50 |
2 files changed, 43 insertions, 15 deletions
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest index 70b3e1843376..54132eaa025f 100644 --- a/media-sound/cdparanoia/Manifest +++ b/media-sound/cdparanoia/Manifest @@ -2,10 +2,10 @@ AUX 3.9.8-gcc34.patch 772 RMD160 c13aac76c54ac969e45a87b26f56fc62a4a72d07 SHA1 8 MD5 8dfcb53296c1e66ba13fb02d81eef39b files/3.9.8-gcc34.patch 772 RMD160 c13aac76c54ac969e45a87b26f56fc62a4a72d07 files/3.9.8-gcc34.patch 772 SHA256 ffe735303a300d358ba99fc85f6d28c4bc7bc7ce90bf42b9838803fcc99cf150 files/3.9.8-gcc34.patch 772 -AUX cdparanoia-3.10_pre0-Makefile.in.patch 2399 RMD160 a38e8f60eb69c1f03b6691f455fc598bd8e97aa4 SHA1 16c1eb57619d253229dc95f25724b68817d8c1f9 SHA256 c08b6f426237e01ea581ce1e7b5f3981f89103975cf8f13769734050b980d689 -MD5 721ad6a7d30997d7e5868a395459cbf0 files/cdparanoia-3.10_pre0-Makefile.in.patch 2399 -RMD160 a38e8f60eb69c1f03b6691f455fc598bd8e97aa4 files/cdparanoia-3.10_pre0-Makefile.in.patch 2399 -SHA256 c08b6f426237e01ea581ce1e7b5f3981f89103975cf8f13769734050b980d689 files/cdparanoia-3.10_pre0-Makefile.in.patch 2399 +AUX cdparanoia-3.10_pre0-Makefile.in.patch 2953 RMD160 c9a869fce12029a7d370e291ee22f68a302c05db SHA1 9bce808fd217766a8ae530c9e01c993072e1732b SHA256 6f0a4e0d6dd3e221d262661ae8bc5070e67f4d243eb28019bf819d8027ffbe00 +MD5 338bcdb0fe1a472fd5f6af68cd35c5c5 files/cdparanoia-3.10_pre0-Makefile.in.patch 2953 +RMD160 c9a869fce12029a7d370e291ee22f68a302c05db files/cdparanoia-3.10_pre0-Makefile.in.patch 2953 +SHA256 6f0a4e0d6dd3e221d262661ae8bc5070e67f4d243eb28019bf819d8027ffbe00 files/cdparanoia-3.10_pre0-Makefile.in.patch 2953 AUX cdparanoia-3.10_pre0-include-cdda_interface_h.patch 556 RMD160 42832206bf52a3629559d8090f57b3e74d64a421 SHA1 677c0c96de896277a2cf2ce811889e67c195af12 SHA256 c3dabd747091f2d3f2335f523b44a1ef5ab4b9c908fbd76b9d9feb5f40dd95f8 MD5 69ecfbab5fbeb81f710db7528e194ebf files/cdparanoia-3.10_pre0-include-cdda_interface_h.patch 556 RMD160 42832206bf52a3629559d8090f57b3e74d64a421 files/cdparanoia-3.10_pre0-include-cdda_interface_h.patch 556 diff --git a/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch b/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch index e9bbec259982..cbc696ea29e3 100644 --- a/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch +++ b/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch @@ -1,29 +1,51 @@ diff -ur cdparanoia-III-10pre0.orig/interface/Makefile.in cdparanoia-III-10pre0/interface/Makefile.in --- cdparanoia-III-10pre0.orig/interface/Makefile.in 2006-08-30 01:14:08.000000000 +0300 -+++ cdparanoia-III-10pre0/interface/Makefile.in 2007-10-20 20:33:09.000000000 +0300 -@@ -32,8 +32,7 @@ ++++ cdparanoia-III-10pre0/interface/Makefile.in 2007-10-20 20:53:40.000000000 +0300 +@@ -10,6 +10,7 @@ + FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@ + OPT=@OPT@ $(FLAGS) + DEBUG=@DEBUG@ -DCDDA_TEST ++LIBFLAGS = -fPIC + CC=@CC@ + LD=@CC@ + LDFLAGS=@LDFLAGS@ $(FLAGS) +@@ -32,8 +33,7 @@ $(MAKE) libcdda_interface.a CFLAGS="$(OPT)" slib: - $(MAKE) lessmessy - $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" -+ $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fPIC" ++ $(MAKE) libcdda_interface.so CFLAGS="$(OPT)" [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0 test: -@@ -46,7 +45,7 @@ +@@ -46,12 +46,12 @@ $(RANLIB) libcdda_interface.a libcdda_interface.so: $(OFILES) - $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) -+ $(CC) $(OFILES) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LDFLAGS) $(LIBS) ++ $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0 [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so + .c.o: +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< + + lessmessy: + -rm -f *.o core *~ *.out diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/paranoia/Makefile.in --- cdparanoia-III-10pre0.orig/paranoia/Makefile.in 2006-08-29 22:06:04.000000000 +0300 -+++ cdparanoia-III-10pre0/paranoia/Makefile.in 2007-10-20 20:33:31.000000000 +0300 -@@ -21,7 +21,7 @@ ++++ cdparanoia-III-10pre0/paranoia/Makefile.in 2007-10-20 20:57:07.000000000 +0300 +@@ -11,6 +11,7 @@ + FLAGS=@TYPESIZES@ @CFLAGS@ + OPT=@OPT@ $(FLAGS) + DEBUG=@DEBUG@ ++LIBFLAGS = -fPIC + CC=@CC@ + LD=@CC@ + LDFLAGS=@LDFLAGS@ $(FLAGS) +@@ -21,7 +22,7 @@ OFILES = paranoia.o p_block.o overlap.o gap.o isort.o #TFILES = isort.t gap.t p_block.t paranoia.t @@ -32,22 +54,28 @@ diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/p export VERSION all: lib slib -@@ -33,8 +33,7 @@ +@@ -33,8 +34,7 @@ $(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" slib: - $(MAKE) lessmessy - $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" -+ $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fPIC" ++ $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)" #test: $(TFILES) # -@@ -44,7 +43,7 @@ +@@ -44,12 +44,12 @@ $(RANLIB) libcdda_paranoia.a libcdda_paranoia.so: $(OFILES) - $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface -+ $(CC) $(OFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) -L ../interface -lcdda_interface -fPIC $(LIBS) ++ $(CC) $(OFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(LIBFLAGS) -L ../interface -lcdda_interface [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so + .c.o: +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< + + .c.t: + $(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS) |