Fix paths while installing #100954 by Karl Tomlinson.

(Portage version: 2.0.51.22-r2)

4 files changed, 76 insertions, 2 deletions

diff --git a/media-libs/jpeg-mmx/ChangeLog b/media-libs/jpeg-mmx/ChangeLog
index bf6289c0e0df..f39b62ee0138 100644
--- a/media-libs/jpeg-mmx/ChangeLog
+++ b/media-libs/jpeg-mmx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/jpeg-mmx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-mmx/ChangeLog,v 1.13 2005/07/28 03:46:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-mmx/ChangeLog,v 1.14 2005/08/21 04:34:30 vapier Exp $
+
+*jpeg-mmx-0.1.6-r1 (21 Aug 2005)
+
+  21 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  files/jpeg-mmx-0.1.6-makefile.patch, +jpeg-mmx-0.1.6-r1.ebuild:
+  Fix paths while installing #100954 by Karl Tomlinson.
 
 *jpeg-mmx-0.1.6 (28 Jul 2005)
 
diff --git a/media-libs/jpeg-mmx/files/digest-jpeg-mmx-0.1.6-r1 b/media-libs/jpeg-mmx/files/digest-jpeg-mmx-0.1.6-r1
new file mode 100644
index 000000000000..d8b6cf2f216b
--- /dev/null
+++ b/media-libs/jpeg-mmx/files/digest-jpeg-mmx-0.1.6-r1
@@ -0,0 +1 @@
+MD5 9156c429bd8c4dea65c877c50ed89e15 jpeg-mmx-0.1.6.tar.gz 597439
diff --git a/media-libs/jpeg-mmx/files/jpeg-mmx-0.1.6-makefile.patch b/media-libs/jpeg-mmx/files/jpeg-mmx-0.1.6-makefile.patch
index 45d5cb9c959d..a083427fd5c7 100644
--- a/media-libs/jpeg-mmx/files/jpeg-mmx-0.1.6-makefile.patch
+++ b/media-libs/jpeg-mmx/files/jpeg-mmx-0.1.6-makefile.patch
@@ -1,6 +1,24 @@
 --- makefile.cfg
 +++ makefile.cfg
-@@ -250,6 +250,7 @@
+@@ -11,13 +11,13 @@
+ # Where to install the programs and man pages.
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = $(exec_prefix)/bin
+-libdir = $(exec_prefix)/lib
+-includedir = $(prefix)/include
++bindir = @bindir@
++libdir = @libdir@
++includedir = @includedir@
+ binprefix =
+ manprefix =
+ manext = 1
+-mandir = $(prefix)/man/man$(manext)
++mandir = @mandir@/man$(manext)
+ 
+ # The name of your C compiler:
+ CC= @CC@
+@@ -251,6 +251,7 @@
  
  
  %.o: %.s ; 	$(AS) $(ASFLAGS) -o $@ $<
diff --git a/media-libs/jpeg-mmx/jpeg-mmx-0.1.6-r1.ebuild b/media-libs/jpeg-mmx/jpeg-mmx-0.1.6-r1.ebuild
new file mode 100644
index 000000000000..3ea63d4eeba3
--- /dev/null
+++ b/media-libs/jpeg-mmx/jpeg-mmx-0.1.6-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-mmx/jpeg-mmx-0.1.6-r1.ebuild,v 1.1 2005/08/21 04:34:30 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="JPEG library with mmx enhancements"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE=""
+
+DEPEND="dev-lang/nasm"
+RDEPEND=""
+
+S=${WORKDIR}/jpeg-mmx
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-PIC.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	econf \
+		--includedir=/usr/include/jpeg-mmx \
+		--enable-shared \
+		--enable-static \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /usr/include/jpeg-mmx
+	make install-headers prefix="${D}"/usr || die "headers"
+
+	for x in cjpeg djpeg jpegtran ; do
+		newbin .libs/${x} ${x}-mmx || die "dobin ${x}"
+	done
+
+	dolib.a .libs/libjpeg-mmx.a || die "dolib.a"
+	cp -a .libs/libjpeg-mmx.so* libjpeg-mmx.la "${D}"/usr/lib/ || die "dolib.so"
+
+	dodoc README change.log structure.doc libjpeg.doc
+}