xv lefft auch

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5155 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2010-01-20 12:52:06 +00:00
parent a4af1cb43d
commit f5ebc33ece
2 changed files with 12 additions and 13 deletions

View File

@ -21,3 +21,4 @@
0 tools/foomatic-filters 0 tools/foomatic-filters
0 tools/foomatic-db-engine 0 tools/foomatic-db-engine
0 tools/foomatic-db 0 tools/foomatic-db
0 guibased/xv

View File

@ -68,7 +68,7 @@
# #
#Pfad zum Basis-Sourcetree : #Pfad zum Basis-Sourcetree :
SRCPATH=X11/Grafik SRCPATH=GuiBased/Apps
(( MKPKG = $MKPKG | 128 )) (( MKPKG = $MKPKG | 128 ))
#Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
@ -76,26 +76,24 @@ SRCPATH=X11/Grafik
premk() { premk() {
X11R7_Fix
mkdir -p $TMPROOT/usr/X11R7/bin mkdir -p $TMPROOT/usr/X11R7/bin
tar -zxvf $LFSSOURCE/$SRCPATH/xv-3.10a-jumbo-patches-*.tar.gz tar -C ../ -xvf $LFSSOURCE/$SRCPATH/xv-3.10a-jumbo-patches-*.tar.gz
for i in $LFSSOURCE/$SRCPATH/xv-*patch.gz; do for i in $LFSSOURCE/$SRCPATH/xv-*patch.gz; do
gzip -d -c $i|patch gzip -d -c $i|patch
done done
find . -type f -exec sed -i "s/X11R6/X11R7/g" {} \;
} }
mk() { mk() {
xmkmf xmkmf
sed -e "/^JPEGDIR/d" Makefile |\ sed -i "/^JPEGDIR/d" Makefile
sed -e "s%^LIBJPEG.*$%LIBJPEG = /usr/$LIBDIR/libjpeg.so%" |\ sed -i "s%^LIBJPEG.*$%LIBJPEG = /usr/$LIBDIR/libjpeg6b.so%" Makefile
sed -e "s%^JPEGINC.*$%JPEGINC = -I/usr/include%" |\ sed -i "s%^JPEGINC.*$%JPEGINC = -I/usr/include%" Makefile
sed -e "/^TIFFDIR/d" |\ sed -i "/^TIFFDIR/d" Makefile
sed -e "s%^LIBTIFF.*$%LIBTIFF = /usr/$LIBDIR/libtiff.a%" |\ sed -i "s%^LIBTIFF.*$%LIBTIFF = /usr/$LIBDIR/libtiff.a%" Makefile
sed -e "s%-lm%-lm -lz%" |\ sed -i "s%-lm%-lm -lz%" Makefile
sed -e "s%^TIFFINCLUDE.*$%TIFFINCLUDE = -I/usr/include%" >Makefile~ sed -i "s%^TIFFINCLUDE.*$%TIFFINCLUDE = -I/usr/include%" Makefile
mv Makefile~ Makefile sed -i "/extern char \*sys_errlist/d" xv.h
sed -e "/extern char \*sys_errlist/d" xv.h >xv.h~
mv xv.h~ xv.h
make CC="gcc $BUILDOPTIONS" \ make CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \
LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \