diff options
| author |   Achim Gottinger <achim@gentoo.org> | 2001-04-29 19:27:11 +0000 |
|---|---|---|
| committer | Achim Gottinger <achim@gentoo.org> | 2001-04-29 19:27:11 +0000 |
| commit | 6ead59fe6cb21408be1f272fc82c4fbf78ba7ccd (patch) | |
| tree | 78051d950487057e916d82ce6c82e8480d7d6eb2 /media-video | |
| parent | Update, FHS2.1 fix (diff) | |
| download | gentoo-2-6ead59fe6cb21408be1f272fc82c4fbf78ba7ccd.tar.gz gentoo-2-6ead59fe6cb21408be1f272fc82c4fbf78ba7ccd.tar.bz2 gentoo-2-6ead59fe6cb21408be1f272fc82c4fbf78ba7ccd.zip | |
Fixes for glib
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mjpeg-tools/files/Makefile | 4 | ||||
| -rw-r--r-- | media-video/mjpeg-tools/mjpeg-tools-1a.ebuild | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media-video/mjpeg-tools/files/Makefile b/media-video/mjpeg-tools/files/Makefile index 937dae95dfcd..ca6d901414f2 100644 --- a/media-video/mjpeg-tools/files/Makefile +++ b/media-video/mjpeg-tools/files/Makefile @@ -7,12 +7,12 @@ LIBS_AND_OPT= $(LIBS) -lpng -lz -ljpeg # uncomment if you want to use ALSA, # the Advanced Linux Sound Architecture (http://alsa.jcu.cz) -USE_ALSA = -DUSE_ALSA -lasound +#USE_ALSA = -DUSE_ALSA -lasound #this is for software MJPEG playback, and GLib is used by movtarlib L_FLAGS = -lpthread -lSDL -lglib -CFLAGS = -O2 -I . -I buz -I quicktime/quicktime -I mjpeg -I movtar -I/usr/lib/glib/include +CFLAGS = -O2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I . -I buz -I quicktime/quicktime -I mjpeg -I movtar all: lavrec lavplay lavvideo diff --git a/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild b/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild index 7ac309e3ef06..5b112f4cb140 100644 --- a/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild +++ b/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild,v 1.4 2000/11/02 08:31:51 achim Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild,v 1.5 2001/04/29 19:27:11 achim Exp $ P=mjpeg-tools-1a A="mjpeg_beta_1a.tar.gz quicktime4linux-1.1.9.tar.gz" @@ -20,7 +20,7 @@ DEPEND=">=sys-libs/glibc-2.1.3 src_unpack() { unpack ${A} cd ${S} - sed -e "s:-O2:${CFLAGS}:" ${O}/files/Makefile > Makefile + sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > Makefile cd aenc cp Makefile Makefile.orig sed -e "s:\.\./jpeg-6b-mmx/libjpeg\.a:-ljpeg:" Makefile.orig > Makefile |