Merge branch 'master' into openelec-pvr

This commit is contained in:
Gujs 2011-02-08 18:50:12 +01:00
commit 11fcffea1f
44 changed files with 304 additions and 6990 deletions

View File

@ -1,38 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--disable-static \
--enable-shared \
--with-mp4v2
make -C libfaac
$MAKEINSTALL -C libfaac
mkdir -p $SYSROOT_PREFIX/usr/include
cp include/*.h $SYSROOT_PREFIX/usr/include

View File

@ -1,26 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/libfaac/.libs/*.so* $INSTALL/usr/lib

View File

@ -1,36 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="faac"
PKG_VERSION="1.28"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="http://www.audiocoding.com/"
PKG_URL="$SOURCEFORGE_SRC/faac/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="faac: An MPEG-4 AAC encoder"
PKG_LONGDESC="The FAAC project includes the AAC encoder supporting several MPEG-4 object types (LC, Main, LTP, HE AAC, PS) and file formats (ADTS AAC, raw AAC, MP4), multichannel and gapless encoding as well as MP4 metadata tags. The codecs are compatible with standard-compliant audio applications using one or more of these profiles."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

View File

@ -31,6 +31,7 @@ cd $PKG_BUILD
--without-xmms \
--without-drm \
--without-mpeg4ip \
--with-gnu-ld
make

View File

@ -1,35 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_faad-stdio.dpatch by <matthew@ibis.bells>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad faad2-2.6.1~/frontend/faad.man faad2-2.6.1/frontend/faad.man
--- faad2-2.6.1~/frontend/faad.man 2008-06-17 04:27:16.000000000 +0100
+++ faad2-2.6.1/frontend/faad.man 2008-06-17 04:27:17.000000000 +0100
@@ -73,7 +73,7 @@
Quiet \- Suppresses status messages during processing.
.TP
.B \-t ", \-\^\-oldformat"
-Sets the processing to use the old MPEG\(hy4 AAC ADTS format when outputting in said format.
+Sets the processing output to be sent to the standard out. Only raw PCM may be sent to the standard out, as headers cannot currently be streamed.
.TP
.B \-w ", \-\^\-stdio"
Sets the processing output to be sent to the standard out.
diff -urNad faad2-2.6.1~/frontend/main.c faad2-2.6.1/frontend/main.c
--- faad2-2.6.1~/frontend/main.c 2007-11-01 12:33:29.000000000 +0000
+++ faad2-2.6.1/frontend/main.c 2008-06-17 03:58:33.000000000 +0100
@@ -1190,9 +1190,10 @@
}
/* only allow raw data on stdio */
- if (writeToStdio == 1)
+ if (writeToStdio && (format != 2))
{
- format = 2;
+ faad_fprintf(stderr, "Only raw PCM data (2) may be sent to the standard out.\n");
+ return 1;
}
/* point to the specified file name */

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="mysql"
PKG_VERSION="5.1.54"
PKG_VERSION="5.1.55"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"

View File

@ -23,4 +23,4 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/.libs/libpng14.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/.libs/libpng*.so* $INSTALL/usr/lib

View File

@ -1,7 +1,7 @@
diff -Naur libpng-1.4.1/pngconf.h libpng-1.4.1.patch/pngconf.h
--- libpng-1.4.1/pngconf.h 2010-02-25 12:38:29.000000000 +0100
+++ libpng-1.4.1.patch/pngconf.h 2010-04-16 21:09:43.641352386 +0200
@@ -869,6 +869,10 @@
diff -Naur libpng-1.4.5/pngconf.h libpng-1.4.5.patch/pngconf.h
--- libpng-1.4.5/pngconf.h 2010-12-09 14:48:10.000000000 +0100
+++ libpng-1.4.5.patch/pngconf.h 2011-02-08 11:49:58.016628521 +0100
@@ -894,6 +894,10 @@
# define PNG_READ_tRNS_SUPPORTED
# define PNG_tRNS_SUPPORTED
#endif
@ -12,7 +12,7 @@ diff -Naur libpng-1.4.1/pngconf.h libpng-1.4.1.patch/pngconf.h
#ifndef PNG_NO_READ_zTXt
# define PNG_READ_zTXt_SUPPORTED
# define PNG_zTXt_SUPPORTED
@@ -1028,6 +1032,14 @@
@@ -1053,6 +1057,14 @@
# define PNG_TEXT_SUPPORTED
# endif
#endif
@ -27,9 +27,9 @@ diff -Naur libpng-1.4.1/pngconf.h libpng-1.4.1.patch/pngconf.h
#ifdef PNG_WRITE_tIME_SUPPORTED
# ifndef PNG_NO_CONVERT_tIME
diff -Naur libpng-1.4.1/pngget.c libpng-1.4.1.patch/pngget.c
--- libpng-1.4.1/pngget.c 2010-02-25 12:38:29.000000000 +0100
+++ libpng-1.4.1.patch/pngget.c 2010-04-16 21:09:34.942347204 +0200
diff -Naur libpng-1.4.5/pngget.c libpng-1.4.5.patch/pngget.c
--- libpng-1.4.5/pngget.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngget.c 2011-02-08 11:49:58.009628646 +0100
@@ -842,6 +842,167 @@
}
#endif
@ -198,10 +198,10 @@ diff -Naur libpng-1.4.1/pngget.c libpng-1.4.1.patch/pngget.c
#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
png_uint_32 PNGAPI
png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
diff -Naur libpng-1.4.1/png.h libpng-1.4.1.patch/png.h
--- libpng-1.4.1/png.h 2010-02-25 12:38:29.000000000 +0100
+++ libpng-1.4.1.patch/png.h 2010-04-16 21:09:36.985444853 +0200
@@ -888,6 +888,19 @@
diff -Naur libpng-1.4.5/png.h libpng-1.4.5.patch/png.h
--- libpng-1.4.5/png.h 2010-12-09 14:48:10.000000000 +0100
+++ libpng-1.4.5.patch/png.h 2011-02-08 11:49:58.011628611 +0100
@@ -902,6 +902,19 @@
png_fixed_point int_y_blue PNG_DEPSTRUCT;
#endif
@ -221,7 +221,7 @@ diff -Naur libpng-1.4.1/png.h libpng-1.4.1.patch/png.h
} png_info;
typedef png_info FAR * png_infop;
@@ -985,6 +998,10 @@
@@ -999,6 +1012,10 @@
#define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */
#define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */
#define PNG_INFO_IDAT 0x8000L /* ESR, 1.0.6 */
@ -232,7 +232,7 @@ diff -Naur libpng-1.4.1/png.h libpng-1.4.1.patch/png.h
/* This is used for the transformation routines, as some of them
* change these values for the row. It also should enable using
@@ -1026,6 +1043,10 @@
@@ -1040,6 +1057,10 @@
typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
png_uint_32, int));
@ -243,7 +243,7 @@ diff -Naur libpng-1.4.1/png.h libpng-1.4.1.patch/png.h
#endif
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
@@ -1445,6 +1466,36 @@
@@ -1459,6 +1480,36 @@
png_uint_32 user_chunk_cache_max PNG_DEPSTRUCT;
#endif
@ -280,94 +280,94 @@ diff -Naur libpng-1.4.1/png.h libpng-1.4.1.patch/png.h
/* New member added in libpng-1.0.25 and 1.2.17 */
#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
/* Storage for unknown chunk that the library doesn't recognize. */
@@ -1773,6 +1824,18 @@
extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
@@ -1796,6 +1847,18 @@
PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
png_bytepp image));
+#ifdef PNG_WRITE_APNG_SUPPORTED
+extern PNG_EXPORT (void,png_write_frame_head) PNGARG((png_structp png_ptr,
+PNG_EXPORT (void,png_write_frame_head) PNGARG((png_structp png_ptr,
+ png_infop png_info, png_bytepp row_pointers,
+ png_uint_32 width, png_uint_32 height,
+ png_uint_32 x_offset, png_uint_32 y_offset,
+ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
+ png_byte blend_op));
+
+extern PNG_EXPORT (void,png_write_frame_tail) PNGARG((png_structp png_ptr,
+PNG_EXPORT (void,png_write_frame_tail) PNGARG((png_structp png_ptr,
+ png_infop png_info));
+#endif
+
/* Write the end of the PNG file. */
extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
png_infop info_ptr));
@@ -2017,6 +2080,11 @@
@@ -2040,6 +2103,11 @@
png_voidp progressive_ptr,
png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
png_progressive_end_ptr end_fn));
+#ifdef PNG_READ_APNG_SUPPORTED
+extern PNG_EXPORT(void,png_set_progressive_frame_fn) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_progressive_frame_fn) PNGARG((png_structp png_ptr,
+ png_progressive_frame_ptr frame_info_fn,
+ png_progressive_frame_ptr frame_end_fn));
+#endif
/* Returns the user pointer associated with the push read functions */
extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
@@ -2443,6 +2511,53 @@
PNG_EXPORT(png_voidp,png_get_progressive_ptr)
@@ -2466,6 +2534,53 @@
#endif
#endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
+#ifdef PNG_APNG_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_acTL) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_uint_32,png_get_acTL) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays));
+extern PNG_EXPORT(png_uint_32,png_set_acTL) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_uint_32,png_set_acTL) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays));
+extern PNG_EXPORT(png_uint_32,png_get_num_frames) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_uint_32,png_get_num_frames) PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32,png_get_num_plays)
+PNG_EXPORT(png_uint_32,png_get_num_plays)
+ PNGARG((png_structp png_ptr, png_infop info_ptr));
+
+extern PNG_EXPORT(png_uint_32,png_get_next_frame_fcTL)
+PNG_EXPORT(png_uint_32,png_get_next_frame_fcTL)
+ PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 *width,
+ png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset,
+ png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op,
+ png_byte *blend_op));
+extern PNG_EXPORT(png_uint_32,png_set_next_frame_fcTL)
+PNG_EXPORT(png_uint_32,png_set_next_frame_fcTL)
+ PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 width,
+ png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset,
+ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
+ png_byte blend_op));
+extern PNG_EXPORT(png_uint_32,png_get_next_frame_width)
+PNG_EXPORT(png_uint_32,png_get_next_frame_width)
+ PNGARG((png_structp png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32,png_get_next_frame_height)
+PNG_EXPORT(png_uint_32,png_get_next_frame_height)
+ PNGARG((png_structp png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32,png_get_next_frame_x_offset)
+PNG_EXPORT(png_uint_32,png_get_next_frame_x_offset)
+ PNGARG((png_structp png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32,png_get_next_frame_y_offset)
+PNG_EXPORT(png_uint_32,png_get_next_frame_y_offset)
+ PNGARG((png_structp png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_16,png_get_next_frame_delay_num)
+PNG_EXPORT(png_uint_16,png_get_next_frame_delay_num)
+ PNGARG((png_structp png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_16,png_get_next_frame_delay_den)
+PNG_EXPORT(png_uint_16,png_get_next_frame_delay_den)
+ PNGARG((png_structp png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_byte,png_get_next_frame_dispose_op)
+PNG_EXPORT(png_byte,png_get_next_frame_dispose_op)
+ PNGARG((png_structp png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_byte,png_get_next_frame_blend_op)
+PNG_EXPORT(png_byte,png_get_next_frame_blend_op)
+ PNGARG((png_structp png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_byte,png_get_first_frame_is_hidden)
+PNG_EXPORT(png_byte,png_get_first_frame_is_hidden)
+ PNGARG((png_structp png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32,png_set_first_frame_is_hidden)
+PNG_EXPORT(png_uint_32,png_set_first_frame_is_hidden)
+ PNGARG((png_structp png_ptr, png_infop info_ptr, png_byte is_hidden));
+#endif /* PNG_APNG_SUPPORTED */
+
+#ifdef PNG_READ_APNG_SUPPORTED
+extern PNG_EXPORT(void,png_read_frame_head) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_read_frame_head) PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+#endif
+
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
/* Provide a list of chunks and how they are to be handled, if the built-in
handling or default unknown chunk handling is not desired. Any chunks not
diff -Naur libpng-1.4.1/pngpread.c libpng-1.4.1.patch/pngpread.c
--- libpng-1.4.1/pngpread.c 2010-02-25 12:38:29.000000000 +0100
+++ libpng-1.4.1.patch/pngpread.c 2010-04-16 21:09:45.794352317 +0200
diff -Naur libpng-1.4.5/pngpread.c libpng-1.4.5.patch/pngpread.c
--- libpng-1.4.5/pngpread.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngpread.c 2011-02-08 11:49:58.023628393 +0100
@@ -205,6 +205,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
PNG_zTXt;
@ -614,7 +614,7 @@ diff -Naur libpng-1.4.1/pngpread.c libpng-1.4.1.patch/pngpread.c
}
if (png_ptr->idat_size && png_ptr->save_buffer_size)
{
@@ -1716,6 +1904,17 @@
@@ -1756,6 +1944,17 @@
png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
}
@ -632,10 +632,10 @@ diff -Naur libpng-1.4.1/pngpread.c libpng-1.4.1.patch/pngpread.c
png_voidp PNGAPI
png_get_progressive_ptr(png_structp png_ptr)
{
diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.patch/pngpriv.h
--- libpng-1.4.1/pngpriv.h 2010-02-25 12:38:29.000000000 +0100
+++ libpng-1.4.1.patch/pngpriv.h 2010-04-16 21:09:39.167350934 +0200
@@ -98,6 +98,10 @@
diff -Naur libpng-1.4.5/pngpriv.h libpng-1.4.5.patch/pngpriv.h
--- libpng-1.4.5/pngpriv.h 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngpriv.h 2011-02-08 11:49:58.013628575 +0100
@@ -96,6 +96,10 @@
#define PNG_BACKGROUND_IS_GRAY 0x800
#define PNG_HAVE_PNG_SIGNATURE 0x1000
#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
@ -646,7 +646,7 @@ diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.patch/pngpriv.h
/* Flags for the transformations the PNG library does on the image data */
#define PNG_BGR 0x0001
@@ -231,6 +235,14 @@
@@ -229,6 +233,14 @@
#define PNG_tIME PNG_CONST png_byte png_tIME[5] = {116, 73, 77, 69, '\0'}
#define PNG_tRNS PNG_CONST png_byte png_tRNS[5] = {116, 82, 78, 83, '\0'}
#define PNG_zTXt PNG_CONST png_byte png_zTXt[5] = {122, 84, 88, 116, '\0'}
@ -661,7 +661,7 @@ diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.patch/pngpriv.h
/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
@@ -468,6 +480,17 @@
@@ -469,6 +481,17 @@
#endif
#endif
@ -679,7 +679,7 @@ diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.patch/pngpriv.h
/* Called when finished processing a row of data */
PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
@@ -520,6 +543,20 @@
@@ -521,6 +544,20 @@
PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
png_infop info_ptr));
@ -700,7 +700,7 @@ diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.patch/pngpriv.h
/* These are the functions that do the transformations */
#ifdef PNG_READ_FILLER_SUPPORTED
PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
@@ -736,6 +773,25 @@
@@ -737,6 +774,25 @@
png_uint_32 length));
#endif
@ -726,10 +726,10 @@ diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.patch/pngpriv.h
PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
png_infop info_ptr, png_uint_32 length));
diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
--- libpng-1.4.1/pngread.c 2010-02-25 12:38:29.000000000 +0100
+++ libpng-1.4.1.patch/pngread.c 2010-04-16 21:09:26.430319940 +0200
@@ -300,6 +300,11 @@
diff -Naur libpng-1.4.5/pngread.c libpng-1.4.5.patch/pngread.c
--- libpng-1.4.5/pngread.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngread.c 2011-02-08 11:49:58.008628665 +0100
@@ -278,6 +278,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
PNG_zTXt;
#endif
@ -741,7 +741,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
png_uint_32 length = png_read_chunk_header(png_ptr);
PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
@@ -343,6 +348,9 @@
@@ -321,6 +326,9 @@
!(png_ptr->mode & PNG_HAVE_PLTE))
png_error(png_ptr, "Missing PLTE before IDAT");
@ -751,7 +751,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
png_ptr->idat_size = length;
png_ptr->mode |= PNG_HAVE_IDAT;
break;
@@ -415,12 +423,95 @@
@@ -393,12 +401,95 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
@ -847,7 +847,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
/* Optional call to update the users info_ptr structure */
void PNGAPI
png_read_update_info(png_structp png_ptr, png_infop info_ptr)
@@ -461,6 +552,10 @@
@@ -439,6 +530,10 @@
png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
{
PNG_IDAT;
@ -858,7 +858,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
0xff};
PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
@@ -596,13 +691,39 @@
@@ -581,13 +676,39 @@
{
if (!(png_ptr->zstream.avail_in))
{
@ -900,7 +900,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
}
png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
png_ptr->zstream.next_in = png_ptr->zbuf;
@@ -620,6 +741,9 @@
@@ -605,6 +726,9 @@
png_benign_error(png_ptr, "Extra compressed data");
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
@ -910,7 +910,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
break;
}
if (ret != Z_OK)
@@ -875,6 +999,11 @@
@@ -860,6 +984,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
PNG_zTXt;
#endif
@ -922,7 +922,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
png_uint_32 length = png_read_chunk_header(png_ptr);
PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
@@ -974,6 +1103,14 @@
@@ -959,6 +1088,14 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
@ -937,10 +937,10 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
else
png_handle_unknown(png_ptr, info_ptr, length);
} while (!(png_ptr->mode & PNG_HAVE_IEND));
diff -Naur libpng-1.4.1/pngrtran.c libpng-1.4.1.patch/pngrtran.c
--- libpng-1.4.1/pngrtran.c 2010-02-25 12:38:29.000000000 +0100
+++ libpng-1.4.1.patch/pngrtran.c 2010-04-16 21:09:53.311444698 +0200
@@ -1325,7 +1325,7 @@
diff -Naur libpng-1.4.5/pngrtran.c libpng-1.4.5.patch/pngrtran.c
--- libpng-1.4.5/pngrtran.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngrtran.c 2011-02-08 11:49:58.034628193 +0100
@@ -1335,7 +1335,7 @@
* pixels. This check added to libpng-1.2.19
*/
#if (PNG_WARN_UNINITIALIZED_ROW==1)
@ -949,10 +949,10 @@ diff -Naur libpng-1.4.1/pngrtran.c libpng-1.4.1.patch/pngrtran.c
#else
png_warning(png_ptr, "Uninitialized row");
#endif
diff -Naur libpng-1.4.1/pngrutil.c libpng-1.4.1.patch/pngrutil.c
--- libpng-1.4.1/pngrutil.c 2010-02-25 12:38:29.000000000 +0100
+++ libpng-1.4.1.patch/pngrutil.c 2010-04-16 21:09:49.604444890 +0200
@@ -434,6 +434,11 @@
diff -Naur libpng-1.4.5/pngrutil.c libpng-1.4.5.patch/pngrutil.c
--- libpng-1.4.5/pngrutil.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngrutil.c 2011-02-08 11:49:58.026628338 +0100
@@ -499,6 +499,11 @@
filter_type = buf[11];
interlace_type = buf[12];
@ -964,7 +964,7 @@ diff -Naur libpng-1.4.1/pngrutil.c libpng-1.4.1.patch/pngrutil.c
/* Set internal variables */
png_ptr->width = width;
png_ptr->height = height;
@@ -2318,6 +2323,172 @@
@@ -2394,6 +2399,172 @@
}
#endif
@ -1137,7 +1137,7 @@ diff -Naur libpng-1.4.1/pngrutil.c libpng-1.4.1.patch/pngrutil.c
/* This function is called when we haven't found a handler for a
chunk. If there isn't a problem with the chunk itself (ie bad
chunk name, CRC, or a critical chunk), the chunk is silently ignored
@@ -3353,4 +3524,73 @@
@@ -3422,4 +3593,73 @@
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
@ -1211,9 +1211,9 @@ diff -Naur libpng-1.4.1/pngrutil.c libpng-1.4.1.patch/pngrutil.c
+}
+#endif /* PNG_READ_APNG_SUPPORTED */
#endif /* PNG_READ_SUPPORTED */
diff -Naur libpng-1.4.1/pngset.c libpng-1.4.1.patch/pngset.c
--- libpng-1.4.1/pngset.c 2010-02-25 12:38:29.000000000 +0100
+++ libpng-1.4.1.patch/pngset.c 2010-04-16 21:09:47.875332919 +0200
diff -Naur libpng-1.4.5/pngset.c libpng-1.4.5.patch/pngset.c
--- libpng-1.4.5/pngset.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngset.c 2011-02-08 11:49:58.024628375 +0100
@@ -260,6 +260,11 @@
info_ptr->rowbytes = 0;
else
@ -1226,7 +1226,7 @@ diff -Naur libpng-1.4.1/pngset.c libpng-1.4.1.patch/pngset.c
}
#ifdef PNG_oFFs_SUPPORTED
@@ -932,6 +937,142 @@
@@ -939,6 +944,142 @@
}
#endif /* PNG_sPLT_SUPPORTED */
@ -1369,9 +1369,9 @@ diff -Naur libpng-1.4.1/pngset.c libpng-1.4.1.patch/pngset.c
#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
void PNGAPI
png_set_unknown_chunks(png_structp png_ptr,
diff -Naur libpng-1.4.1/pngwrite.c libpng-1.4.1.patch/pngwrite.c
--- libpng-1.4.1/pngwrite.c 2010-02-25 12:38:30.000000000 +0100
+++ libpng-1.4.1.patch/pngwrite.c 2010-04-16 21:09:40.967447171 +0200
diff -Naur libpng-1.4.5/pngwrite.c libpng-1.4.5.patch/pngwrite.c
--- libpng-1.4.5/pngwrite.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngwrite.c 2011-02-08 11:49:58.014628557 +0100
@@ -57,6 +57,10 @@
/* The rest of these check to see if the valid field has the appropriate
* flag set, and if it does, writes the chunk.
@ -1434,10 +1434,10 @@ diff -Naur libpng-1.4.1/pngwrite.c libpng-1.4.1.patch/pngwrite.c
+#endif /* PNG_WRITE_APNG_SUPPORTED */
+
#endif /* PNG_WRITE_SUPPORTED */
diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
--- libpng-1.4.1/pngwutil.c 2010-02-25 12:38:30.000000000 +0100
+++ libpng-1.4.1.patch/pngwutil.c 2010-04-16 21:09:51.260444582 +0200
@@ -539,6 +539,11 @@
diff -Naur libpng-1.4.5/pngwutil.c libpng-1.4.5.patch/pngwutil.c
--- libpng-1.4.5/pngwutil.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngwutil.c 2011-02-08 11:49:58.031628246 +0100
@@ -541,6 +541,11 @@
/* Write the chunk */
png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
@ -1449,7 +1449,7 @@ diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
/* Initialize zlib with PNG info */
png_ptr->zstream.zalloc = png_zalloc;
png_ptr->zstream.zfree = png_zfree;
@@ -661,6 +666,9 @@
@@ -663,6 +668,9 @@
png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
{
PNG_IDAT;
@ -1459,7 +1459,7 @@ diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
png_debug(1, "in png_write_IDAT");
@@ -705,7 +713,28 @@
@@ -707,7 +715,28 @@
"Invalid zlib compression method or flags in IDAT");
}
@ -1488,7 +1488,7 @@ diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
png_ptr->mode |= PNG_HAVE_IDAT;
}
@@ -1712,6 +1741,66 @@
@@ -1714,6 +1743,66 @@
}
#endif
@ -1555,7 +1555,7 @@ diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
/* Initializes the row writing capability of libpng */
void /* PRIVATE */
png_write_start_row(png_structp png_ptr)
@@ -2113,8 +2202,8 @@
@@ -2115,8 +2204,8 @@
#ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
{
@ -1564,9 +1564,9 @@ diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
+ /* These use previous row */
+ filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_AVG | PNG_FILTER_PAETH);
}
#endif
#endif
@@ -2783,4 +2872,39 @@
@@ -2785,4 +2874,39 @@
}
#endif
}

View File

@ -46,12 +46,6 @@ else
XBMC_DVDCSS="--disable-dvdcss"
fi
if [ "$FAAC_SUPPORT" = yes ]; then
XBMC_FAAC="--enable-faac"
else
XBMC_FAAC="--disable-faac"
fi
if [ "$AVAHI_DAEMON" = yes ]; then
XBMC_AVAHI="--enable-avahi"
else
@ -142,7 +136,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag
--disable-ccache \
$XBMC_PULSEAUDIO \
--enable-ffmpeg-libvorbis \
$XBMC_FAAC \
--disable-faac \
$XBMC_DVDCSS \
--disable-mid \
$XBMC_AVAHI \

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="connman"
PKG_VERSION="0.68"
PKG_VERSION="0.69"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="transmission"
PKG_VERSION="2.20b3"
PKG_VERSION="2.20"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -0,0 +1,11 @@
--- busybox-1.18.2/networking/ping.c
+++ busybox-1.18.2-ping/networking/ping.c
@@ -394,7 +394,7 @@ static void sendping4(int junk UNUSED_PA
#if ENABLE_PING6
static void sendping6(int junk UNUSED_PARAM)
{
- struct icmp6_hdr *pkt = alloca(datalen + sizeof(struct icmp6_hdr) + 4);
+ struct icmp6_hdr *pkt = G.snd_packet;
//memset(pkt, 0, datalen + sizeof(struct icmp6_hdr) + 4);
pkt->icmp6_type = ICMP6_ECHO_REQUEST;

View File

@ -0,0 +1,15 @@
--- busybox-1.18.2/archival/tar.c
+++ busybox-1.18.2-tar/archival/tar.c
@@ -1037,8 +1037,10 @@ int tar_main(int argc UNUSED_PARAM, char
tar_handle->src_fd = tar_fd;
tar_handle->seek = seek_by_read;
} else {
- if (ENABLE_FEATURE_TAR_AUTODETECT && flags == O_RDONLY) {
- get_header_ptr = get_header_tar;
+ if (ENABLE_FEATURE_TAR_AUTODETECT
+ && flags == O_RDONLY
+ && get_header_ptr == get_header_tar
+ ) {
tar_handle->src_fd = open_zipped(tar_filename);
if (tar_handle->src_fd < 0)
bb_perror_msg_and_die("can't open '%s'", tar_filename);

View File

@ -0,0 +1,11 @@
--- busybox-1.18.2/networking/udhcp/common.c
+++ busybox-1.18.2-udhcp/networking/udhcp/common.c
@@ -375,7 +375,7 @@ static NOINLINE void attach_option(
new->data = xmalloc(length + OPT_DATA);
new->data[OPT_CODE] = optflag->code;
new->data[OPT_LEN] = length;
- memcpy(new->data + OPT_DATA, buffer, length);
+ memcpy(new->data + OPT_DATA, (allocated ? allocated : buffer), length);
curr = opt_list;
while (*curr && (*curr)->data[OPT_CODE] < optflag->code)

View File

@ -0,0 +1,140 @@
diff -Naur lm_sensors-3.2.0-old/CHANGES lm_sensors-3.2.0-new/CHANGES
--- lm_sensors-3.2.0-old/CHANGES 2011-01-19 19:04:13.000000000 -0800
+++ lm_sensors-3.2.0-new/CHANGES 2011-01-19 19:04:29.000000000 -0800
@@ -18,6 +18,7 @@
Add support for Intel PCH (SMBus)
Add support for SMSC EMC1403 and EMC1404
Fix detection of RB-C3 AMD Family 10h CPU
+ Implement universal detection for coretemp
Add support for SMSC EMC2103
Add support for Fintek F71889ED
Add support for ITE IT8721F
diff -Naur lm_sensors-3.2.0-old/prog/detect/sensors-detect lm_sensors-3.2.0-new/prog/detect/sensors-detect
--- lm_sensors-3.2.0-old/prog/detect/sensors-detect 2011-01-19 19:04:13.000000000 -0800
+++ lm_sensors-3.2.0-new/prog/detect/sensors-detect 2011-01-19 19:04:29.000000000 -0800
@@ -23,7 +23,7 @@
require 5.004;
use strict;
-use Fcntl;
+use Fcntl qw(:DEFAULT :seek);
use File::Basename;
# We will call modprobe, which typically lives in either /sbin,
@@ -2025,13 +2025,9 @@
driver => "k10temp",
detect => \&fam11h_pci_detect,
}, {
- name => "Intel Core family thermal sensor",
+ name => "Intel digital thermal sensor",
driver => "coretemp",
- detect => sub { coretemp_detect(0); },
- }, {
- name => "Intel Atom thermal sensor",
- driver => "coretemp",
- detect => sub { coretemp_detect(1); },
+ detect => \&coretemp_detect,
}, {
name => "Intel AMB FB-DIMM thermal sensor",
driver => "i5k_amb",
@@ -2293,10 +2289,10 @@
while (<INPUTFILE>) {
if (m/^processor\s*:\s*(\d+)/) {
push @cpu, $entry if scalar keys(%{$entry}); # Previous entry
- $entry = {}; # New entry
+ $entry = { nr => $1 }; # New entry
next;
}
- if (m/^(vendor_id|cpu family|model|model name|stepping)\s*:\s*(.+)$/) {
+ if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) {
my $k = $1;
my $v = $2;
$v =~ s/\s+/ /g; # Merge multiple spaces
@@ -2465,6 +2461,15 @@
$modules_list{$normalized} = 1;
}
+# udev may take some time to create device nodes when loading modules
+sub udev_settle
+{
+ if (!(-x "/sbin/udevadm" && system("/sbin/udevadm settle") == 0)
+ && !(-x "/sbin/udevsettle" && system("/sbin/udevsettle") == 0)) {
+ sleep(1);
+ }
+}
+
sub initialize_modules_supported
{
foreach my $chip (@chip_ids) {
@@ -5754,23 +5759,33 @@
return;
}
+sub cpuid
+{
+ my ($cpu_nr, $eax) = @_;
+
+ sysopen(CPUID, "/dev/cpu/$cpu_nr/cpuid", O_RDONLY) or return;
+ binmode CPUID;
+ sysseek(CPUID, $eax, SEEK_SET)
+ or die "Cannot seek /dev/cpu/$cpu_nr/cpuid";
+ sysread(CPUID, my $data, 16)
+ or die "Cannot read /dev/cpu/$cpu_nr/cpuid";
+ close CPUID;
+
+ return unpack("L4", $data);
+}
+
sub coretemp_detect
{
- my $chip = shift;
my $probecpu;
foreach $probecpu (@cpu) {
next unless $probecpu->{vendor_id} eq 'GenuineIntel' &&
- $probecpu->{'cpu family'} == 6;
- return 9 if $chip == 0 &&
- ($probecpu->{model} == 14 || # Pentium M DC
- $probecpu->{model} == 15 || # Core 2 DC 65nm
- $probecpu->{model} == 0x16 || # Core 2 SC 65nm
- $probecpu->{model} == 0x17 || # Penryn 45nm
- $probecpu->{model} == 0x1a || # Nehalem
- $probecpu->{model} == 0x1e); # Lynnfield
- return 9 if $chip == 1 &&
- ($probecpu->{model} == 0x1c); # Atom
+ $probecpu->{'cpuid level'} >= 6;
+
+ # Now we check for the DTS flag
+ my @regs = cpuid($probecpu->{nr}, 6);
+ return unless @regs == 4;
+ return 9 if ($regs[0] & (1 << 0)); # eax, bit 0
}
return;
}
@@ -6124,6 +6139,12 @@
print "Some south bridges, CPUs or memory controllers contain embedded sensors.\n".
"Do you want to scan for them? This is totally safe. (YES/no): ";
unless (<STDIN> =~ /^\s*n/i) {
+ # Load the cpuid driver if needed
+ unless (-e "/dev/cpu/$cpu[0]->{nr}/cpuid") {
+ load_module("cpuid");
+ udev_settle();
+ }
+
$| = 1;
foreach my $entry (@cpu_ids) {
scan_cpu($entry);
@@ -6199,12 +6220,7 @@
$by_default = 1 if dmi_match('board_vendor', 'asustek', 'tyan',
'supermicro');
- # udev may take some time to create the device node
- if (!(-x "/sbin/udevadm" && system("/sbin/udevadm settle") == 0)
- && !(-x "/sbin/udevsettle" && system("/sbin/udevsettle") == 0)) {
- sleep(1);
- }
-
+ udev_settle();
for (my $dev_nr = 0; $dev_nr < @i2c_adapters; $dev_nr++) {
next unless exists $i2c_adapters[$dev_nr];
scan_i2c_adapter($dev_nr, $by_default);

View File

@ -0,0 +1,12 @@
diff -Naur lm_sensors-3.2.0-old/etc/sensors.conf.default lm_sensors-3.2.0-new/etc/sensors.conf.default
--- lm_sensors-3.2.0-old/etc/sensors.conf.default 2011-02-07 19:37:38.000000000 -0800
+++ lm_sensors-3.2.0-new/etc/sensors.conf.default 2011-02-07 19:38:19.000000000 -0800
@@ -285,7 +285,7 @@
# set in8_max 3.0 * 1.10
-chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*"
+chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*" "nct6775-*" "nct6776-*"
label in0 "Vcore"
label in2 "AVCC"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="ntfs-3g"
PKG_VERSION="2010.10.2"
PKG_VERSION="2011.1.15"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="eglibc"
PKG_VERSION="2.12-12461"
PKG_VERSION="2.12-12750"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xorg-server"
PKG_VERSION="1.9.3.902"
PKG_VERSION="1.9.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -2046,8 +2046,8 @@ CONFIG_STAGING=y
# CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set
# CONFIG_BRCM80211 is not set
# CONFIG_RT2860 is not set
# CONFIG_RT2870 is not set
CONFIG_RT2860=m
CONFIG_RT2870=m
# CONFIG_COMEDI is not set
# CONFIG_ASUS_OLED is not set
# CONFIG_R8187SE is not set

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -78,10 +78,6 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
# build and install with FAAC support in XBMC
# FAAC is an MPEG-4 and MPEG-2 AAC encoder (yes / no)
FAAC_SUPPORT="yes"
# build and install Tvheadend TV server (yes / no)
TVHEADEND="yes"

View File

@ -78,10 +78,6 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
# build and install with FAAC support in XBMC
# FAAC is an MPEG-4 and MPEG-2 AAC encoder (yes / no)
FAAC_SUPPORT="yes"
# build and install Tvheadend TV server (yes / no)
TVHEADEND="yes"

View File

@ -78,10 +78,6 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
# build and install with FAAC support in XBMC
# FAAC is an MPEG-4 and MPEG-2 AAC encoder (yes / no)
FAAC_SUPPORT="yes"
# build and install Tvheadend TV server (yes / no)
TVHEADEND="yes"

View File

@ -78,10 +78,6 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
# build and install with FAAC support in XBMC
# FAAC is an MPEG-4 and MPEG-2 AAC encoder (yes / no)
FAAC_SUPPORT="yes"
# build and install Tvheadend TV server (yes / no)
TVHEADEND="yes"

View File

@ -23,7 +23,6 @@
. config/options $1
[ ! -f "$PKG_BUILD/configure.in" -a ! -f "$PKG_BUILD/configure.ac" ] && echo "configure.in or configure.ac not found" && exit 1
#[ ! -f "$PKG_BUILD/Makefile.am" -a ! -f "$PKG_BUILD/Makefile.in" ] && echo "Makefile.am or Makefile.in not found" && exit 1
printf "%${INDENT}c AUTORECONF $1\n" >&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))

View File

@ -22,11 +22,18 @@
. config/options $1
for i in $@; do
[ -f "$i/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $i
[ -f "$i/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $i
[ -f "$i/configure.guess" ] && cp -f $SCRIPTS/configtools/config.guess $i/configure.guess
[ -f "$i/configure.sub" ] && cp -f $SCRIPTS/configtools/config.sub $i/configure.sub
[ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
[ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
for i in `find $PKG_BUILD -name config.guess`; do
CONFIGTOOLSDIR=`dirname $i`
printf "%${INDENT}c FIXCONFIG $1: $CONFIGTOOLSDIR\n" >&$SILENT_OUT
[ -f "$CONFIGTOOLSDIR/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $CONFIGTOOLSDIR
[ -f "$CONFIGTOOLSDIR/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $CONFIGTOOLSDIR
[ -f "$CONFIGTOOLSDIR/configure.guess" ] && cp -f $SCRIPTS/configtools/config.guess $CONFIGTOOLSDIR/configure.guess
[ -f "$CONFIGTOOLSDIR/configure.sub" ] && cp -f $SCRIPTS/configtools/config.sub $CONFIGTOOLSDIR/configure.sub
done
exit 0

View File

@ -85,7 +85,7 @@ for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
fi
done
$SCRIPTS/fixconfigtools $PKG_BUILD
$SCRIPTS/fixconfigtools $1
[ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT

View File

@ -1,45 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
echo "getting sources..."
svn co svn://svn.eglibc.org/branches/eglibc-2_11/libc eglibc-2.11-latest
svn co svn://svn.eglibc.org/branches/eglibc-2_11/ports eglibc-2.11-latest/ports
svn co svn://svn.eglibc.org/branches/eglibc-2_11/linuxthreads/linuxthreads eglibc-2.11-latest/linuxthreads
svn co svn://svn.eglibc.org/branches/eglibc-2_11/linuxthreads/linuxthreads_db eglibc-2.11-latest/linuxthreads_db
echo "getting version..."
cd eglibc-2.11-latest
SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
echo $SVN_REV
cd ..
echo "copying sources..."
rm -rf eglibc-2.11-$SVN_REV
cp -R eglibc-2.11-latest eglibc-2.11-$SVN_REV
echo "cleaning sources..."
find eglibc-2.11-$SVN_REV -name .svn -exec rm -rf {} ";"
echo "packing sources..."
tar cvjf eglibc-2.11-$SVN_REV.tar.bz2 eglibc-2.11-$SVN_REV
echo "remove temporary sourcedir..."
rm -rf eglibc-2.11-$SVN_REV