Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=86fd1a7878b3848fea6cd1fb2a08f9cca7c782d9
commit 86fd1a7878b3848fea6cd1fb2a08f9cca7c782d9 Author: Miklos Vajna <[email protected]> Date: Wed Nov 18 10:26:00 2015 +0100 cdparanoia-10.2-3-x86_64 - fix build diff --git a/source/multimedia/cdparanoia/FrugalBuild b/source/multimedia/cdparanoia/FrugalBuild index 5409407..4c0509c 100644 --- a/source/multimedia/cdparanoia/FrugalBuild +++ b/source/multimedia/cdparanoia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=cdparanoia pkgver=10.2 -pkgrel=2 +pkgrel=3 pkgdesc="A CD ripping application" url="http://www.xiph.org/paranoia" depends=('glibc') @@ -12,9 +12,10 @@ archs=('i686' 'x86_64') _F_archive_name="cdparanoia-III" up2date="Flastarchive http://downloads.xiph.org/releases/cdparanoia/ .src.tgz" source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz \ - private.patch) + private.patch cdparanoia-10.2-install.patch) sha1sums=('1901e20d3a370ca6afa4c76a9ef30d3f03044320' \ - '943bc156733f71d5f2c4773c8073e366eac3e45c') + '943bc156733f71d5f2c4773c8073e366eac3e45c' \ + 'e863d9c48356d331f5516111ace1b3e4953e6344') build() { Fpatchall @@ -22,6 +23,6 @@ build() [ "$CARCH" == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" ## Do _NOT_ remove this OPT=.. has default -O20 .. make OPT="${CFLAGS}" || Fdie - Fmakeinstall + make install DESTDIR=$Fdestdir || Fdie } # optimization OK diff --git a/source/multimedia/cdparanoia/cdparanoia-10.2-install.patch b/source/multimedia/cdparanoia/cdparanoia-10.2-install.patch new file mode 100644 index 0000000..bd43d5e --- /dev/null +++ b/source/multimedia/cdparanoia/cdparanoia-10.2-install.patch @@ -0,0 +1,50 @@ +diff -Naupr cdparanoia-III-10.2.orig/Makefile.in cdparanoia-III-10.2/Makefile.in +--- cdparanoia-III-10.2.orig/Makefile.in 2008-09-11 22:33:30.000000000 +0200 ++++ cdparanoia-III-10.2/Makefile.in 2008-12-22 22:31:45.578372040 +0100 +@@ -63,28 +63,28 @@ slib: + cd paranoia && $(MAKE) slib + + install: +- $(INSTALL) -d -m 0755 $(BINDIR) +- $(INSTALL) -m 755 $(srcdir)/cdparanoia $(BINDIR) +- $(INSTALL) -d -m 0755 $(MANDIR) +- $(INSTALL) -d -m 0755 $(MANDIR)/man1 +- $(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1 +- $(INSTALL) -d -m 0755 $(INCLUDEDIR) +- $(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR) +- $(INSTALL) -d -m 0755 $(LIBDIR) +- $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR) +- $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR) +- $(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR) +- $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR) +- $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR) +- $(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 $(srcdir)/cdparanoia $(DESTDIR)$(BINDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man1 ++ $(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1 ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0755 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL) -m 0755 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR) + ln -fs libcdda_interface.so.0.$(VERSION) \ +- $(LIBDIR)/libcdda_interface.so.0 ++ $(DESTDIR)$(LIBDIR)/libcdda_interface.so.0 + ln -fs libcdda_interface.so.0.$(VERSION) \ +- $(LIBDIR)/libcdda_interface.so ++ $(DESTDIR)$(LIBDIR)/libcdda_interface.so + ln -fs libcdda_paranoia.so.0.$(VERSION) \ +- $(LIBDIR)/libcdda_paranoia.so.0 ++ $(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0 + ln -fs libcdda_paranoia.so.0.$(VERSION) \ +- $(LIBDIR)/libcdda_paranoia.so ++ $(DESTDIR)$(LIBDIR)/libcdda_paranoia.so + + cdparanoia: $(OFILES) $(LIBDEP) + $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
