Diverse Bugfixes, anpassungen an V962, USE_ARCH Eingebaut. openquicktime wird wenn moeglich

durch libquicktime ersetzt



git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4690 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-05-14 16:33:49 +00:00
parent 2c16d2302c
commit 291e32d7f2
7 changed files with 97 additions and 74 deletions

View File

@ -1,49 +1,45 @@
0 tools/pkgconfig
0 tools/libsigc++
0 tools/libusb
0 tools/expat
0 tools/libpng
1 tools/libxml2
0 tools/libxslt
0 tools/parted
0 tools/libmad
0 tools/libid3tag
0 tools/taglib
0 tools/fam
0 tools/libnet
0 tools/svgalib
0 tools/openssl
0 tools/pcre
0 tools/alsa-lib
1 tools/bluez-libs
0 tools/libsidplay
0 tools/libraw1394
0 tools/libavc1394
0 tools/libiec61883
0 tools/libsamplerate
0 tools/libao
0 tools/libogg
0 tools/libvorbis
0 tools/libmusicbrainz
#0 tools/pkgconfig
#0 tools/libusb
#0 tools/expat
#0 tools/libpng
#1 tools/libxml2
#0 tools/libxslt
#0 tools/libsigc++
#0 tools/parted
#0 tools/libmad
#0 tools/libid3tag
#0 tools/taglib
#0 tools/fam
#0 tools/libnet
#0 tools/svgalib
#0 tools/openssl
#0 tools/pcre
#0 tools/alsa-lib
#1 tools/bluez-libs
#0 tools/libsidplay
#0 tools/libraw1394
#0 tools/libavc1394
#0 tools/libiec61883
#0 tools/libsamplerate
#0 tools/libao
#0 tools/libogg
#0 tools/libvorbis
#0 tools/libiconv
0 tools/id3lib
0 tools/libidn
0 tools/libgpg-error
0 tools/libgcrypt
0 tools/libsmi
0 tools/lzo
0 tools/libghttp
0 tools/libPropList
0 tools/jpegsrc
0 tools/lcms
0 tools/libmng
0 xsys/libmcal
0 tools/glib-1
0 tools/glib-2
0 tools/libIDL
0 xsys/libmpeg3
0 tools/libfame
0 tools/openquicktime
#0 tools/id3lib
#0 tools/libidn
#0 tools/libgpg-error
#0 tools/libgcrypt
#0 tools/libsmi
#0 tools/lzo
#0 tools/libghttp
#0 tools/jpegsrc
#0 tools/lcms
#0 tools/libmng
#0 tools/glib-2
#0 tools/libIDL
#0 xsys/libmpeg3
#0 tools/libfame
0 tools/libquicktime
0 tools/libdvdcss
0 xsys/dbus-glib
0 tools/libcdio
@ -56,3 +52,14 @@
0 tools/libdvdread
0 xsys/liboil
0 xsys/boost
#brauch cmake damits lefft
#0 tools/libmusicbrainz
#Keine Abhängigkeiten finden können
#Kompiliert auch nicht mehr
#kann möglicherweise weggelassen werden!
#0 tools/libPropList
#0 tools/glib-1
#Braucht gcc-3
#0 xsys/libmcal
#wird vorraussichtlich durch Libquicktime ersetzt
#0 tools/openquicktime

View File

@ -78,14 +78,18 @@ premk() {
}
mk32() {
CC="/opt/gcc-3/bin/gcc -m32" \
CXX="/opt/gcc-3/bin/g++ -m32" \
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
./configure --target=$TARGET32 \
--host=$TARGET32 \
--with-libiconv \
--prefix=/usr/X11R7 &&
make -j $NUMCPU -k
make -j $NUMCPU -k DESTDIR=$TMPROOT install
make -j $NUMCPU
cd glib/.libs
gcc -shared -fPIC -m32 -Wl,-soname,libglib-1.3.so.15.0.0 -o libglib-1.3.so.15.0.0 libglib-1.3.a
cd -
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
make distclean
}
@ -94,8 +98,8 @@ mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/X11R7/lib64"
fi
CC="/opt/gcc-3/bin/gcc" \
CXX="/opt/gcc-3/bin/g++" \
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
./configure --target=$TARGET \
--host=$TARGET \
--with-libiconv \

View File

@ -80,6 +80,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--host=$TARGET32 \
--build=$TARGET32 \
@ -98,6 +99,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
--prefix=/usr/X11R7 \
$ADDOPTIONS \

View File

@ -81,11 +81,14 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr &&
make -j $NUMCPU &&
make -j $NUMCPU DESTDIR=$TMPROOT install
CheckError "Make install process failed !" 1
mv $TMPROOT/usr/bin/libIDL-config-2{,-32}
ln -s libIDL-config-2-32 $TMPROOT/usr/bin/libIDL-config-32
make distclean
}
@ -95,6 +98,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
$ADDOPTIONS \
--prefix=/usr &&
@ -104,8 +108,14 @@ mk() {
}
postmk() {
cd $TMPROOT/usr/bin
ln -s libIDL-config-2 libIDL-config
if [ "$MK64BIT" == "true" ]; then
mv $TMPROOT/usr/bin/libIDL-config-2{,-64}
ln -s libIDL-config-2-64 $TMPROOT/usr/bin/libIDL-config-64
ln -s multiarch_wrapper $TMPROOT/usr/bin/libIDL-config-2
ln -s multiarch_wrapper $TMPROOT/usr/bin/libIDL-config
else
ln -s libIDL-config-2 $TMPROOT/usr/bin/libIDL-config
fi
cd $TMPROOT/usr/lib
ln -s libIDL-2.so.?.?.? libIDL.so
}

View File

@ -83,6 +83,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr \
--enable-mmx &&
@ -91,6 +92,8 @@ mk32() {
make -j $NUMCPU &&
make -j $NUMCPU DESTDIR=$TMPROOT install
make distclean
ClearHostSysNameing32 $TMPROOT
mv $TMPROOT/usr/bin/libfame-config{,-32}
}
#Hier wird der Make Prozess der Sourcen definiert
@ -100,6 +103,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
--prefix=/usr \
$ADDOPTIONS \
@ -112,4 +116,8 @@ mk() {
#in $TMPROOT noch einiges korrigieren
postmk() {
ClearHostSysNameing $TMPROOT
if [ "$MK64BIT" == "true" ]; then
mv $TMPROOT/usr/bin/libfame-config{,-64}
ln -s multiarch_wrapper $TMPROOT/usr/bin/libfame-config
fi
}

View File

@ -79,13 +79,11 @@ premk() {
}
mk32() {
CC="/opt/gcc-3/bin/gcc -m32" \
CXX="/opt/gcc-3/bin/g++ -m32" \
LDFLAGS="-L/usr/lib -L/usr/X11R7/lib" \
./configure --target=$TARGET32 \
--prefix=/usr \
--enable-debug=no \
--enable-mmx=yes &&
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --prefix=/usr \
--x-libraries=/usr/X11R7/lib &&
make -j $NUMCPU &&
make -j $NUMCPU prefix=$TMPROOT/usr install
make clean
@ -95,20 +93,14 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
mkdir -p $TMPROOT/usr/lib64
fi
if [ ! "$CPU" == "P" ] && [ ! "$CPU"="K6" ]; then
CPUOPTIONS=--enable-mmx=yes
else
CPUOPTIONS=--enable-mmx=no
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
--prefix=/usr \
$ADDOPTIONS \
$CPUOPTIONS \
--enable-debug=no &&
--with-vorbis-libraries=/usr/$LIBDIR &&
make -j $NUMCPU
make -j $NUMCPU prefix=$TMPROOT/usr install
}

View File

@ -87,13 +87,13 @@ fi
mk32() {
cd icap
sed -e "s/ld /ld -melf_i386 /" Makefile >Makefile.32
make -f Makefile.32 CC="/opt/gcc-3/bin/gcc -m32" LDFLAGS="-m32" &&
make -f Makefile.32 CC="gcc $BUILDOPTIONS32" LDFLAGS="-m32" &&
cd ../mstore
sed -e "s/ld /ld -melf_i386 /" Makefile >Makefile.32
make -f Makefile.32 CC="/opt/gcc-3/bin/gcc -m32" LDFLAGS="-m32" &&
make -f Makefile.32 CC="gcc $BUILDOPTIONS32" LDFLAGS="-m32" &&
cd ..
chmod 777 *
CC="/opt/gcc-3/bin/gcc -m32" \
CC="gcc $BUILDOPTIONS32" \
./configure --target=$TARGET32 \
--prefix=/usr \
--with-icap \
@ -126,12 +126,12 @@ mk() {
mv $TMPROOT/usr/lib $TMPROOT/usr/lib32
fi
cd icap
make CC="/opt/gcc-3/bin/gcc -fPIC"
make CC="gcc $BUILDOPTIONS -fPIC"
cd ../mstore
make CC="/opt/gcc-3/bin/gcc -fPIC"
make CC="gcc $BUILDOPITONS -fPIC"
cd ..
chmod 777 *
CC="/opt/gcc-3/bin/gcc" \
CC="gcc $BUILDOPTIONS" \
./configure --target=$TARGET \
--prefix=/usr \
$ADDOPTIONS \