archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

merging trunk

Browse Source
This commit is contained in:
Stephan Raue
2010-03-29 22:43:27 +02:00
parent 6070cd1038 bc371a13c4
commit 68b454f909
50 changed files with 609 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/debug/install
View File

@@ -5,3 +5,6 @@
$SCRIPTS/install strace $SCRIPTS/install strace
$SCRIPTS/install gdb $SCRIPTS/install gdb
$SCRIPTS/install bootchart $SCRIPTS/install bootchart
$SCRIPTS/install mrxvt
$SCRIPTS/install evilwm

1
packages/devel/glib/build
View File

@@ -4,6 +4,7 @@
$SCRIPTS/build toolchain $SCRIPTS/build toolchain
$SCRIPTS/build libiconv $SCRIPTS/build libiconv
$SCRIPTS/build zlib
$SCRIPTS/build glib-host $SCRIPTS/build glib-host
cd $PKG_BUILD cd $PKG_BUILD

3
packages/devel/glib/install
View File

@@ -2,8 +2,9 @@
. config/options . config/options
$SCRIPTS/install zlib
$SCRIPTS/install libiconv $SCRIPTS/install libiconv
mkdir -p $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib
cp -PR `find $PKG_BUILD/.build-target/g{lib,module,object,thread,io} -name *.so*` $INSTALL/usr/lib cp -P `find $PKG_BUILD/.build-target/g{lib,module,object,thread,io} -name *.so*` $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libg{lib,module,object,thread,io}*.so*T rm -rf $INSTALL/usr/lib/libg{lib,module,object,thread,io}*.so*T

15
packages/devel/glib/patches/glib-i386-atomic.diff
View File

@@ -1,15 +0,0 @@
diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure
--- glib-2.16.6/configure.atomic 2008-10-27 18:24:20.000000000 -0400
+++ glib-2.16.6/configure 2008-10-27 18:24:31.000000000 -0400
@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse
if test x"$GCC" = xyes; then
case $host_cpu in
- i386)
- { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
- glib_memory_barrier_needed=no
- ;;
i?86)
{ $as_echo "$as_me:$LINENO: result: i486" >&5
$as_echo "i486" >&6; }

4
packages/graphics/Mesa/url
View File

@@ -1,2 +1,2 @@
ftp://freedesktop.org/pub/mesa/7.8/RC/MesaLib-7.8-rc2.tar.bz2 ftp://freedesktop.org/pub/mesa/7.8/MesaLib-7.8.tar.bz2
ftp://freedesktop.org/pub/mesa/7.8/RC/MesaDemos-7.8-rc2.tar.bz2 ftp://freedesktop.org/pub/mesa/7.8/MesaDemos-7.8.tar.bz2

2
packages/mediacenter/xbmc-theme-Confluence/url
View File

@@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-theme-Confluence-28745.tar.bz2 http://sources.openelec.tv/svn/xbmc-theme-Confluence-28910.tar.bz2

187
packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.3.1.diff
View File

@@ -1,187 +0,0 @@
diff -Naur xbmc-28745/configure.in xbmc-28745.patch/configure.in
--- xbmc-28745/configure.in 2010-03-22 06:50:58.000000000 +0100
+++ xbmc-28745.patch/configure.in 2010-03-22 13:17:49.917999744 +0100
@@ -24,6 +24,10 @@
AC_CANONICAL_HOST
+tolower(){
+ echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
+}
+
# General message strings
configure_debug="ERROR: this is a configure debug statement"
missing_library="Could not find a required library. Please see the README for your platform."
@@ -102,6 +106,18 @@
[use_debug=$enableval],
[use_debug=yes])
+AC_ARG_WITH([arch],
+ [AS_HELP_STRING([--with-arch],
+ [build with given arch passing to internal ffmpeg (default is no, needed for crosscompiling)])],
+ [use_arch=$withval],
+ [use_arch=no])
+
+AC_ARG_WITH([cpu],
+ [AS_HELP_STRING([--with-cpu],
+ [build with given cpu passing to ffmpeg (default is no)])],
+ [use_cpu=$withval],
+ [use_cpu=no])
+
AC_ARG_ENABLE([optimizations],
[AS_HELP_STRING([--enable-optimizations],
[enable optimization (default is yes)])],
@@ -805,6 +821,15 @@
fi
fi
+if test "$cross_compiling" = "yes"; then
+ final_message="$final_message\n Crosscomp.:\tYes"
+else
+ final_message="$final_message\n Crosscomp.:\tNo"
+fi
+
+final_message="$final_message\n target ARCH:\t$use_arch"
+final_message="$final_message\n target CPU:\t$use_cpu"
+
if test "$use_optimizations" = "yes"; then
final_message="$final_message\n Optimization:\tYes"
CXXFLAGS="$CXXFLAGS -O2"
@@ -1154,7 +1179,9 @@
cp pyconfig.h Include
else
./configure \
- --enable-ipv6 \
+ --host=$host_alias \
+ --build=$build_alias \
+ --disable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
--enable-shared \
@@ -1217,6 +1244,10 @@
./configure \
--disable-static \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
+ `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
+ `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
+ --target-os=$(tolower $(uname -s)) \
--disable-muxers \
--enable-muxer=spdif \
--enable-muxer=adts \
@@ -1233,6 +1264,7 @@
--enable-postproc \
--enable-gpl \
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
+ --disable-vaapi \
--enable-libfaad \
--enable-protocol=http \
--enable-pthreads \
@@ -1252,6 +1284,8 @@
--disable-win
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \
@@ -1269,6 +1303,8 @@
--with-pic
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-doc \
--enable-static \
--with-pic
@@ -1287,6 +1323,8 @@
cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
else
./configure2 \
+ --host=$host_alias \
+ --build=$build_alias \
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--enable-static \
@@ -1312,6 +1350,8 @@
--cc="$CC"
else
./configure2 \
+ --host=$host_alias \
+ --build=$build_alias \
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
@@ -1344,6 +1384,8 @@
--disable-al-audio
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \
@@ -1379,7 +1421,9 @@
./configure MACOSX_DEPLOYMENT_TARGET=10.4
else
CFLAGS="$CFLAGS -fPIC" \
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [$USE_EXTERNAL_LIBASS])
@@ -1393,6 +1437,8 @@
--with-pic
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1419,6 +1465,8 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1449,6 +1497,8 @@
--disable-skyrocket
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1468,9 +1518,11 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
- ./configure --with-ssl-dir=/opt/local/include
+ ./configure --with-ssl-dir=/opt/local/include
else
- ./configure --without-openssl
+ ./configure --without-openssl \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])
@@ -1479,7 +1531,9 @@
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared
else
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])

49
packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_option_to_set_and_use_ARCH_and_CPU-0.1.diff Normal file
View File

@@ -0,0 +1,49 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 17:12:32.000000000 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 19:39:55.720627540 +0200
@@ -10,6 +10,10 @@
AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
+tolower(){
+ echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
+}
+
# General message strings
configure_debug="ERROR: this is a configure debug statement"
missing_library="Could not find a required library. Please see the README for your platform."
@@ -88,6 +92,18 @@
[use_debug=$enableval],
[use_debug=yes])
+AC_ARG_WITH([arch],
+ [AS_HELP_STRING([--with-arch],
+ [build with given arch passing to internal ffmpeg (default is no, needed for crosscompiling)])],
+ [use_arch=$withval],
+ [use_arch=no])
+
+AC_ARG_WITH([cpu],
+ [AS_HELP_STRING([--with-cpu],
+ [build with given cpu passing to ffmpeg (default is no)])],
+ [use_cpu=$withval],
+ [use_cpu=no])
+
AC_ARG_ENABLE([optimizations],
[AS_HELP_STRING([--enable-optimizations],
[enable optimization (default is yes)])],
@@ -791,6 +807,15 @@
fi
fi
+if test "$cross_compiling" = "yes"; then
+ final_message="$final_message\n Crosscomp.:\tYes"
+else
+ final_message="$final_message\n Crosscomp.:\tNo"
+fi
+
+final_message="$final_message\n target ARCH:\t$use_arch"
+final_message="$final_message\n target CPU:\t$use_cpu"
+
if test "$use_optimizations" = "yes"; then
final_message="$final_message\n Optimization:\tYes"
CXXFLAGS="$CXXFLAGS -O2"

29
packages/mediacenter/xbmc/patches/013_xbmc-correct_lzo_include-0.1.diff
View File

@@ -1,29 +0,0 @@
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--- xbmc-27135/configure.in 2010-01-24 13:07:18.024733190 +0100
+++ xbmc-27135.patch/configure.in 2010-01-24 13:07:39.324609701 +0100
@@ -894,12 +894,6 @@
final_message="$final_message\n MID Support:\tNo"
fi
-if test -d "/usr/include/lzo"; then
- INCLUDES="$INCLUDES -I/usr/include/lzo"
-else
- INCLUDES="$INCLUDES"
-fi
-
if test "$use_ccache" = "yes"; then
if test "$ac_cv_path_CCACHE" = "none"; then
echo "ccache not found. Falling back to default CC"
diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig
diff -Naur xbmc-27135/tools/TexturePacker/XBMCTex.cpp xbmc-27135.patch/tools/TexturePacker/XBMCTex.cpp
--- xbmc-27135/tools/TexturePacker/XBMCTex.cpp 2010-01-24 11:48:16.696641003 +0100
+++ xbmc-27135.patch/tools/TexturePacker/XBMCTex.cpp 2010-01-24 13:07:39.325705415 +0100
@@ -37,7 +37,7 @@
#endif
#ifdef _LINUX
-#include <lzo1x.h>
+#include <lzo/lzo1x.h>
#else
#include "../../xbmc/lib/liblzo/LZO1X.H"
#endif

14
packages/mediacenter/xbmc/patches/101_xbmc-crosscompile_add_support_to_crosscompile_internal_Python-0.1.diff Normal file
View File

@@ -0,0 +1,14 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:08:22.992628860 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:09:49.166752941 +0200
@@ -1171,7 +1171,9 @@
cp pyconfig.h Include
else
./configure \
- --enable-ipv6 \
+ --host=$host_alias \
+ --build=$build_alias \
+ --disable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
--enable-shared \

14
packages/mediacenter/xbmc/patches/111_xbmc-crosscompile_add_support_to_crosscompile_internal_ffmpeg-0.1.diff Normal file
View File

@@ -0,0 +1,14 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:12:19.728751863 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:21:43.927662015 +0200
@@ -1236,6 +1236,10 @@
./configure \
--disable-static \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
+ `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
+ `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
+ --target-os=$(tolower $(uname -s)) \
--disable-muxers \
--enable-muxer=spdif \
--enable-muxer=adts \

12
packages/mediacenter/xbmc/patches/112_xbmc-crosscompile_add_support_to_crosscompile_internal_libdts-0.1.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:24:56.419753331 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:25:57.248628460 +0200
@@ -1275,6 +1275,8 @@
--disable-win
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \

12
packages/mediacenter/xbmc/patches/113_xbmc-crosscompile_add_support_to_crosscompile_internal_libdvdcss-0.1.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:30:55.221751668 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:31:27.299751431 +0200
@@ -1294,6 +1294,8 @@
--with-pic
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-doc \
--enable-static \
--with-pic

12
packages/mediacenter/xbmc/patches/114_xbmc-crosscompile_add_support_to_crosscompile_internal_libdvdread-0.1.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:35:03.335660103 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:36:09.419753169 +0200
@@ -1316,6 +1316,8 @@
./configure2 \
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --host=$host_alias \
+ --build=$build_alias \
--enable-static \
--disable-shared \
--disable-strip \

12
packages/mediacenter/xbmc/patches/115_xbmc-crosscompile_add_support_to_crosscompile_internal_libdvdnav-0.1.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:39:54.548661415 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:40:31.570753522 +0200
@@ -1344,6 +1344,8 @@
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
+ --host=$host_alias \
+ --build=$build_alias \
--enable-static \
--disable-shared \
--cc="$CC"

12
packages/mediacenter/xbmc/patches/116_xbmc-crosscompile_add_support_to_crosscompile_internal_liba52-0.1.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:43:26.857628415 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:44:02.530754199 +0200
@@ -1375,6 +1375,8 @@
--disable-al-audio
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \

14
packages/mediacenter/xbmc/patches/117_xbmc-crosscompile_add_support_to_crosscompile_internal_libass-0.1.diff Normal file
View File

@@ -0,0 +1,14 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:46:17.449635092 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:46:54.862753477 +0200
@@ -1412,7 +1412,9 @@
./configure MACOSX_DEPLOYMENT_TARGET=10.4
else
CFLAGS="$CFLAGS -fPIC" \
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [$USE_EXTERNAL_LIBASS])

12
packages/mediacenter/xbmc/patches/118_xbmc-crosscompile_add_support_to_crosscompile_internal_libid3tag-0.1.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:47:39.398628679 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:48:18.635753312 +0200
@@ -1432,6 +1432,8 @@
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-static \
--with-pic
fi

12
packages/mediacenter/xbmc/patches/119_xbmc-crosscompile_add_support_to_crosscompile_internal_goom-0.1.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:48:58.963753796 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:49:38.035627532 +0200
@@ -1460,6 +1460,8 @@
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-shared \
--enable-static \
--with-pic

12
packages/mediacenter/xbmc/patches/120_xbmc-crosscompile_add_support_to_crosscompile_internal_rsxs-0.1.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:50:17.774753500 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:50:47.902628564 +0200
@@ -1492,6 +1492,8 @@
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --host=$host_alias \
+ --build=$build_alias \
--without-xscreensaver \
--disable-sound \
--disable-cyclone \

Some files were not shown because too many files have changed in this diff Show More