[oe-commits] org.oe.dev merge of '974b595e3879472eb8d938a14f98da8b539e07d5'
thesing commit
openembedded-commits at lists.openembedded.org
Sun Feb 24 15:06:05 UTC 2008
merge of '974b595e3879472eb8d938a14f98da8b539e07d5'
and 'b0f96dc3cc5db2cb812d4c00fad95a9f797c8eac'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 2e318dd1876a8ba350a2509d07b962350e92fc6c
ViewMTN: http://monotone.openembedded.org/revision/info/2e318dd1876a8ba350a2509d07b962350e92fc6c
Files:
1
packages/ffmpeg/ffmpeg
packages/ffmpeg/ffmpeg/common.patch
packages/ffmpeg/ffmpeg/configure.patch
packages/ffmpeg/ffmpeg/soname.patch
packages/altboot/altboot_1.1.1+wip-SVNR79.bb
packages/altboot/altboot_1.1.1+wip-SVNR80.bb
packages/ffmpeg/ffmpeg-0.4.9-pre1/common.patch
packages/ffmpeg/ffmpeg-0.4.9-pre1/gcc4.patch
packages/ffmpeg/ffmpeg.inc
conf/distro/include/sane-srcrevs.inc
packages/ffmpeg/ffmpeg-0.4.9-pre1/soname.patch
packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
packages/ffmpeg/ffmpeg_svn.bb
packages/libgsm/libgsm_1.0.10.bb
packages/meta/slugos-packages.bb
packages/ttf-fonts/ttf-liberation_0.2.bb
packages/klibc/files/staging.patch
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc.inc
packages/klibc/klibc_1.5.bb
Diffs:
#
# mt diff -r974b595e3879472eb8d938a14f98da8b539e07d5 -r2e318dd1876a8ba350a2509d07b962350e92fc6c
#
#
#
# delete "packages/ffmpeg/ffmpeg"
#
# delete "packages/ffmpeg/ffmpeg/common.patch"
#
# delete "packages/ffmpeg/ffmpeg/configure.patch"
#
# delete "packages/ffmpeg/ffmpeg/soname.patch"
#
# rename "packages/altboot/altboot_1.1.1+wip-SVNR79.bb"
# to "packages/altboot/altboot_1.1.1+wip-SVNR80.bb"
#
# rename "packages/ffmpeg/ffmpeg-0.4.9-pre1/common.patch"
# to "packages/ffmpeg/ffmpeg-0.4.9-pre1/gcc4.patch"
#
# add_file "packages/ffmpeg/ffmpeg.inc"
# content [74e136608c8bb3130afc1af896150031726472c0]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [5593e5efc3a50fcda9d2247e1e4eb97b9974d204]
# to [1d34856d9ca6012cc763ecd617e7b2c5f48adb51]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR80.bb"
# from [92a2019a88f00288a822465089cc720b1d997615]
# to [f680e42100ad09229fafcf525dd6cc4715616d19]
#
# patch "packages/ffmpeg/ffmpeg-0.4.9-pre1/gcc4.patch"
# from [5ee4d988df86065005ec4eae34487fbb22fad7be]
# to [e06bb14d05ca453d629816cd6bac9fdb0cdd3fcb]
#
# patch "packages/ffmpeg/ffmpeg-0.4.9-pre1/soname.patch"
# from [6ab3b9703850e212628fd21a2207a61fb08610bc]
# to [7975ff0808bb0cecd0f64222ea9af25c08ca23cb]
#
# patch "packages/ffmpeg/ffmpeg_0.4.9-pre1.bb"
# from [fe267019e08ecb17742294dce763d069e5c3fea1]
# to [204fc94bcae002b164372234b0291b302e3a5307]
#
# patch "packages/ffmpeg/ffmpeg_svn.bb"
# from [bbec70f8e24f42a23765cb68308fc94056887e01]
# to [0ddf51c0c1f64b7d633cd541ce950ce8db509a71]
#
# patch "packages/libgsm/libgsm_1.0.10.bb"
# from [c2b2b7be00c5394f8b1a875d6c5f65fb3121704d]
# to [7f440366f84aad69b5ec6aab21ddd63401253c3b]
#
# patch "packages/meta/slugos-packages.bb"
# from [a0f84eecde8c29aacd23f8d841a38ccb02939c65]
# to [a31e7a2c5a2bf5122f4c51d5daa97760c14afeec]
#
# patch "packages/ttf-fonts/ttf-liberation_0.2.bb"
# from [fe18539b6396ed488cf7b237098a0197235a1cb0]
# to [49d311b3990820ca3220b4c53f655db8b9b22813]
#
============================================================
--- packages/ffmpeg/ffmpeg.inc 74e136608c8bb3130afc1af896150031726472c0
+++ packages/ffmpeg/ffmpeg.inc 74e136608c8bb3130afc1af896150031726472c0
@@ -0,0 +1,39 @@
+DESCRIPTION = "ffmpeg"
+HOMEPAGE = "http://ffmpeg.mplayerhq.hu/"
+AUTHOR = "Fabrice Bellard ffmpeg-devel at mplayerhq.hu"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "zlib libvorbis faac liba52 lame"
+RSUGGESTS = "mplayer"
+
+inherit autotools pkgconfig
+
+TARGET_LDFLAGS_append = " -lm -la52 "
+
+EXTRA_OECONF = "\
+ --enable-pp \
+ --enable-shared \
+ --enable-pthreads \
+ --enable-gpl \
+ \
+ --disable-audio-beos \
+ --disable-v4l \
+ --disable-dv1394 \
+ --disable-debug \
+ --disable-ffserver \
+ --disable-ffplay \
+ \
+ --cross-prefix=${TARGET_PREFIX} \
+ \
+ --cpu=${PACKAGE_ARCH} \
+ \
+"
+
+# We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff..
+PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
+
+do_configure_prepend() {
+ export CC="${CC}"
+}
============================================================
--- conf/distro/include/sane-srcrevs.inc 5593e5efc3a50fcda9d2247e1e4eb97b9974d204
+++ conf/distro/include/sane-srcrevs.inc 1d34856d9ca6012cc763ecd617e7b2c5f48adb51
@@ -52,7 +52,7 @@ SRCREV_pn-linux-ixp4xx ?= "1039"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1039"
-SRCREV_pn-linux-openmoko ?= "4079"
+SRCREV_pn-linux-openmoko ?= "4102"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR79.bb 92a2019a88f00288a822465089cc720b1d997615
+++ packages/altboot/altboot_1.1.1+wip-SVNR80.bb f680e42100ad09229fafcf525dd6cc4715616d19
@@ -1,8 +1,8 @@ PR = "r0"
require altboot.inc
PR = "r0"
-SVN_REV = "79"
+SVN_REV = "80"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
"
============================================================
--- packages/ffmpeg/ffmpeg-0.4.9-pre1/common.patch 5ee4d988df86065005ec4eae34487fbb22fad7be
+++ packages/ffmpeg/ffmpeg-0.4.9-pre1/gcc4.patch e06bb14d05ca453d629816cd6bac9fdb0cdd3fcb
@@ -1,6 +1,21 @@
---- ffmpeg-0.4.9-pre1/libavcodec/common.h.orig 2004-12-24 23:49:50.000000000 +0100
-+++ ffmpeg-0.4.9-pre1/libavcodec/common.h 2004-12-24 23:51:37.000000000 +0100
-@@ -1292,10 +1292,6 @@
+--- ffmpeg-0.4.9-pre1/libavcodec/common.h.orig 2008-02-23 19:42:48.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavcodec/common.h 2008-02-23 19:08:09.000000000 -0500
+@@ -64,11 +64,11 @@
+
+ struct AVOption;
+ #ifdef HAVE_MMX
+-extern const struct AVOption avoptions_common[3 + 5];
++extern const struct AVOption *avoptions_common[2 + 5];
+ #else
+-extern const struct AVOption avoptions_common[3];
++extern const struct AVOption *avoptions_common[2];
+ #endif
+-extern const struct AVOption avoptions_workaround_bug[11];
++extern const struct AVOption *avoptions_workaround_bug[10];
+
+ #endif /* HAVE_AV_CONFIG_H */
+
+@@ -1292,10 +1292,6 @@ tend= rdtsc();\
#define time time_is_forbidden_due_to_security_issues
#define rand rand_is_forbidden_due_to_state_trashing
#define srand srand_is_forbidden_due_to_state_trashing
@@ -11,3 +26,121 @@
#define CHECKED_ALLOCZ(p, size)\
{\
+--- ffmpeg-0.4.9-pre1/libavcodec/ac3tab.h.orig 2008-02-23 19:46:06.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavcodec/ac3tab.h 2008-02-23 19:08:09.000000000 -0500
+@@ -4,10 +4,10 @@
+ */
+
+ /* possible frequencies */
+-static const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
++const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
+
+ /* possible bitrates */
+-static const uint16_t ac3_bitratetab[19] = {
++const uint16_t ac3_bitratetab[19] = {
+ 32, 40, 48, 56, 64, 80, 96, 112, 128,
+ 160, 192, 224, 256, 320, 384, 448, 512, 576, 640
+ };
+@@ -15,7 +15,7 @@ static const uint16_t ac3_bitratetab[19]
+ /* AC3 MDCT window */
+
+ /* MDCT window */
+-static const int16_t ac3_window[256] = {
++const int16_t ac3_window[256] = {
+ 4, 7, 12, 16, 21, 28, 34, 42,
+ 51, 61, 72, 84, 97, 111, 127, 145,
+ 164, 184, 207, 231, 257, 285, 315, 347,
+@@ -144,27 +144,27 @@ static const uint8_t baptab[64]= {
+ 15, 15, 15, 15,
+ };
+
+-static const uint8_t sdecaytab[4]={
++const uint8_t sdecaytab[4]={
+ 0x0f, 0x11, 0x13, 0x15,
+ };
+
+-static const uint8_t fdecaytab[4]={
++const uint8_t fdecaytab[4]={
+ 0x3f, 0x53, 0x67, 0x7b,
+ };
+
+-static const uint16_t sgaintab[4]= {
++const uint16_t sgaintab[4]= {
+ 0x540, 0x4d8, 0x478, 0x410,
+ };
+
+-static const uint16_t dbkneetab[4]= {
++const uint16_t dbkneetab[4]= {
+ 0x000, 0x700, 0x900, 0xb00,
+ };
+
+-static const uint16_t floortab[8]= {
++const uint16_t floortab[8]= {
+ 0x2f0, 0x2b0, 0x270, 0x230, 0x1f0, 0x170, 0x0f0, 0xf800,
+ };
+
+-static const uint16_t fgaintab[8]= {
++const uint16_t fgaintab[8]= {
+ 0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400,
+ };
+
+--- ffmpeg-0.4.9-pre1/libavcodec/dsputil.h.orig 2008-02-23 19:47:34.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavcodec/dsputil.h 2008-02-23 19:08:09.000000000 -0500
+@@ -558,15 +558,15 @@ static int name16(void /*MpegEncContext*
+ /* XXX: add ISOC specific test to avoid specific BSD testing. */
+ /* better than nothing implementation. */
+ /* btw, rintf() is existing on fbsd too -- alex */
+-static inline long int lrintf(float x)
+-{
+-#ifdef CONFIG_WIN32
+- /* XXX: incorrect, but make it compile */
+- return (int)(x);
+-#else
+- return (int)(rint(x));
+-#endif
+-}
++//static inline long int lrintf(float x)
++//{
++//#ifdef CONFIG_WIN32
++// /* XXX: incorrect, but make it compile */
++// return (int)(x);
++//#else
++// return (int)(rint(x));
++//#endif
++//}
+ #else
+ #ifndef _ISOC9X_SOURCE
+ #define _ISOC9X_SOURCE
+--- ffmpeg-0.4.9-pre1/libavcodec/opts.c.orig 2008-02-23 19:49:11.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavcodec/opts.c 2008-02-23 19:08:09.000000000 -0500
+@@ -12,7 +12,7 @@
+
+ #include "avcodec.h"
+
+-const AVOption avoptions_common[] = {
++const AVOption *avoptions_common[] = {
+ AVOPTION_CODEC_FLAG("bit_exact", "use only bit-exact stuff", flags, CODEC_FLAG_BITEXACT, 0),
+ AVOPTION_CODEC_FLAG("mm_force", "force mm flags", dsp_mask, FF_MM_FORCE, 0),
+ #ifdef HAVE_MMX
+@@ -22,10 +22,10 @@ const AVOption avoptions_common[] = {
+ AVOPTION_CODEC_FLAG("mm_sse", "mask SSE feature", dsp_mask, FF_MM_SSE, 0),
+ AVOPTION_CODEC_FLAG("mm_sse2", "mask SSE2 feature", dsp_mask, FF_MM_SSE2, 0),
+ #endif
+- AVOPTION_END()
++// AVOPTION_END()
+ };
+
+-const AVOption avoptions_workaround_bug[] = {
++const AVOption *avoptions_workaround_bug[] = {
+ AVOPTION_CODEC_FLAG("bug_autodetect", "workaround bug autodetection", workaround_bugs, FF_BUG_AUTODETECT, 1),
+ AVOPTION_CODEC_FLAG("bug_old_msmpeg4", "workaround old msmpeg4 bug", workaround_bugs, FF_BUG_OLD_MSMPEG4, 0),
+ AVOPTION_CODEC_FLAG("bug_xvid_ilace", "workaround XviD interlace bug", workaround_bugs, FF_BUG_XVID_ILACE, 0),
+@@ -36,7 +36,7 @@ const AVOption avoptions_workaround_bug[
+ AVOPTION_CODEC_FLAG("bug_std_qpel", "workaround std qpel bug", workaround_bugs, FF_BUG_STD_QPEL, 0),
+ AVOPTION_CODEC_FLAG("bug_qpel_chroma2", "workaround qpel chroma2 bug", workaround_bugs, FF_BUG_QPEL_CHROMA2, 0),
+ AVOPTION_CODEC_FLAG("bug_direct_blocksize", "workaround direct blocksize bug", workaround_bugs, FF_BUG_DIRECT_BLOCKSIZE, 0),
+- AVOPTION_END()
++// AVOPTION_END()
+ };
+
+ /* avoid compatibility problems by redefining it */
============================================================
--- packages/ffmpeg/ffmpeg-0.4.9-pre1/soname.patch 6ab3b9703850e212628fd21a2207a61fb08610bc
+++ packages/ffmpeg/ffmpeg-0.4.9-pre1/soname.patch 7975ff0808bb0cecd0f64222ea9af25c08ca23cb
@@ -1,6 +1,6 @@
---- ffmpeg-0.4.9-pre1/libavcodec/Makefile.orig 2004-08-25 22:36:39.000000000 +0200
-+++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2004-08-25 22:37:22.000000000 +0200
-@@ -7,7 +7,7 @@
+--- ffmpeg-0.4.9-pre1/libavcodec/Makefile.orig 2008-02-23 19:34:18.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2008-02-23 19:24:55.000000000 -0500
+@@ -7,7 +7,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/libavcodec
# NOTE: -I.. is needed to include config.h
@@ -9,7 +9,19 @@
OBJS= common.o utils.o mem.o allcodecs.o \
mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
-@@ -197,7 +197,7 @@
+@@ -89,9 +89,10 @@ endif
+
+ ifeq ($(CONFIG_PP),yes)
+ ifeq ($(SHARED_PP),yes)
+-EXTRALIBS += -lpostproc
++LIBS += -lpostproc
+ else
+ # LIBS += libpostproc/libpostproc.a ... should be fixed
++LIBS += libpostproc/libpostproc.a
+ OBJS += libpostproc/postprocess.o
+ endif
+ endif
+@@ -197,7 +198,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-lib /machine:i386 /def:$(@:.dll=.def)
else
@@ -18,7 +30,7 @@
endif
dsputil.o: dsputil.c dsputil.h
-@@ -269,8 +269,9 @@
+@@ -269,8 +270,9 @@ ifeq ($(CONFIG_WIN32),yes)
install -s -m 755 $(SLIB) "$(prefix)"
else
install -d $(prefix)/lib
@@ -30,10 +42,9 @@
ldconfig || true
endif
else
-
---- ffmpeg-0.4.9-pre1/libavformat/Makefile.orig 2004-08-26 13:45:12.000000000 +0200
-+++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2004-08-26 13:46:00.000000000 +0200
-@@ -6,7 +6,7 @@
+--- ffmpeg-0.4.9-pre1/libavformat/Makefile.orig 2008-02-23 19:37:40.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2008-02-23 19:06:56.000000000 -0500
+@@ -6,7 +6,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/libavformat
@@ -42,7 +53,7 @@
OBJS= utils.o cutils.o os_support.o allformats.o
PPOBJS=
-@@ -54,6 +54,7 @@
+@@ -54,6 +54,7 @@ endif
ifeq ($(CONFIG_AUDIO_BEOS),yes)
PPOBJS+= beosaudio.o
EXTRALIBS+=-lbe -lmedia
@@ -50,7 +61,7 @@
# this should be the default !
EXTRALIBS+=-lavcodec -L../libavcodec
endif
-@@ -93,7 +94,7 @@
+@@ -93,7 +94,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
-lib /machine:i386 /def:$(@:.dll=.def)
else
@@ -59,7 +70,7 @@
endif
depend: $(SRCS)
-@@ -105,8 +106,9 @@
+@@ -105,8 +106,9 @@ ifeq ($(CONFIG_WIN32),yes)
install -s -m 755 $(SLIB) "$(prefix)"
else
install -d $(prefix)/lib
@@ -71,4 +82,3 @@
ldconfig || true
endif
else
-
============================================================
--- packages/ffmpeg/ffmpeg_0.4.9-pre1.bb fe267019e08ecb17742294dce763d069e5c3fea1
+++ packages/ffmpeg/ffmpeg_0.4.9-pre1.bb 204fc94bcae002b164372234b0291b302e3a5307
@@ -1,85 +1,60 @@
+require ffmpeg.inc
-DESCRIPTION = "ffmpeg"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "zlib libvorbis faad2 faac liba52 lame mplayer"
-LICENSE = "LGPL"
-PR = "r1"
+DEPENDS += "faad2"
+PR = "r2"
-inherit autotools
-
SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
file://configure.patch;patch=0 \
- file://common.patch;patch=1 \
+ file://gcc4.patch;patch=1 \
file://soname.patch;patch=1 \
"
-TARGET_LDFLAGS_append = " -lm -la52 "
-
-EXTRA_OECONF=" \
- --enable-mp3lame \
- --enable-vorbis \
- --enable-faad \
- --enable-faadbin \
- --enable-faac \
- --enable-a52 \
- --enable-a52bin \
- --enable-pp \
- --enable-shared-pp \
- --enable-shared \
- --disable-amr_nb \
- --enable-amr_nb-fixed \
- --disable-amr_wb \
- --enable-pthreads \
- --enable-gpl \
- --enable-zlib \
- \
- --disable-audio-beos \
- --disable-v4l \
- --disable-dv1394 \
- --disable-debug \
- --disable-ffserver \
- --disable-ffplay \
- \
- --cross-prefix=${TARGET_PREFIX} \
- --extra-cflags=\$(TARGET_CFLAGS) \
- --extra-ldflags=\$(TARGET_LDFLAGS) \
- --extra-libs=\$(TARGET_LDFLAGS) \
- \
- --cpu=${PACKAGE_ARCH} \
- --prefix=${D}${prefix} \
- --mandir=${D}${prefix}/share/man \
+EXTRA_OECONF += " \
+ --enable-mp3lame \
+ --enable-vorbis \
+ --enable-faad \
+ --enable-faadbin \
+ --enable-faac \
+ --enable-a52 \
+ --enable-a52bin \
+ --enable-shared-pp \
+ --disable-amr_nb \
+ --enable-amr_nb-fixed \
+ --disable-amr_wb \
+ --enable-zlib \
+ \
+ \
+ --extra-cflags=\$(TARGET_CFLAGS) \
+ --extra-ldflags=\$(TARGET_LDFLAGS) \
+ --extra-libs=\$(TARGET_LDFLAGS) \
+ \
+ --prefix=${D}${prefix} \
+ --mandir=${D}${prefix}/share/man \
"
PACKAGES += "libavcodec libavcodec-dev libavformat libavformat-dev"
-FILES_${PN} = "${bindir}"
+
+FILES_${PN} += "${libdir}/vhook"
FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-dbg += "${libdir}/vhook/.debug"
+
FILES_libavcodec = "${libdir}/libavcodec*.so.*"
FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
FILES_libavformat = "${libdir}/libavformat*.so.*"
FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
-# We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
-
-# --enable-shared-pp \
-
-do_configure_prepend() {
- export CC="${CC}"
-}
-
do_stage() {
- oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
- oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}/ffmpeg
- install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
- install -m 0644 ${S}/libavcodec/common.h ${STAGING_INCDIR}/ffmpeg/common.h
- install -m 0644 ${S}/libavcodec/rational.h ${STAGING_INCDIR}/ffmpeg/rational.h
- install -m 0644 ${S}/libavformat/avformat.h ${STAGING_INCDIR}/ffmpeg/avformat.h
- install -m 0644 ${S}/libavformat/avio.h ${STAGING_INCDIR}/ffmpeg/avio.h
- install -m 0644 ${S}/libavformat/rtp.h ${STAGING_INCDIR}/ffmpeg/rtp.h
- install -m 0644 ${S}/libavformat/rtsp.h ${STAGING_INCDIR}/ffmpeg/rtsp.h
- install -m 0644 ${S}/libavformat/rtspcodes.h ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
+ install -d ${STAGING_INCDIR}/ffmpeg
+ install -m 0644 $%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rb0f96dc3cc5db2cb812d4c00fad95a9f797c8eac -r2e318dd1876a8ba350a2509d07b962350e92fc6c
#
#
#
# patch "packages/klibc/files/staging.patch"
# from [744788fb708efea82c9caafcb0509e1581351bcb]
# to [bc1975706bc1a71fd1daa124ac8934b6cd1183f2]
#
# patch "packages/klibc/klibc-utils-static_1.5.bb"
# from [712cc1a9eaaf4de058b8926a6f376e589d0c865c]
# to [b5447c8999eb05a38a9dc43898f7b18b130f8f28]
#
# patch "packages/klibc/klibc.inc"
# from [53e4f37f521ba3c1a20198a13faa8a95f2f812b8]
# to [c62d790171545f80dae278f763a0f6b65fecec54]
#
# patch "packages/klibc/klibc_1.5.bb"
# from [8afd19f9d2e288ae6198fe88d8c74fb36aa9b9b3]
# to [643abab68d99c185d9d7b361de44cd819352e425]
#
============================================================
--- packages/klibc/files/staging.patch 744788fb708efea82c9caafcb0509e1581351bcb
+++ packages/klibc/files/staging.patch bc1975706bc1a71fd1daa124ac8934b6cd1183f2
@@ -1,6 +1,7 @@
-diff -ru klibc.clean/Makefile klibc-1.5/Makefile
---- klibc.clean/Makefile 2008-02-08 22:37:36.000000000 +0100
-+++ klibc-1.5/Makefile 2008-02-15 12:46:48.000000000 +0100
+Index: klibc-1.5/Makefile
+===================================================================
+--- klibc-1.5.orig/Makefile 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/Makefile 2008-02-24 15:25:15.213824149 +0100
@@ -33,7 +33,7 @@
export PERL := perl
@@ -10,10 +11,11 @@ diff -ru klibc.clean/Makefile klibc-1.5/
export bindir = $(prefix)/bin
export libdir = $(prefix)/lib
export mandir = $(prefix)/man
-diff -ru klibc.clean/scripts/Kbuild.install klibc-1.5/scripts/Kbuild.install
---- klibc.clean/scripts/Kbuild.install 2008-02-08 22:37:36.000000000 +0100
-+++ klibc-1.5/scripts/Kbuild.install 2008-02-18 22:36:35.434193918 +0100
-@@ -88,14 +88,11 @@
+Index: klibc-1.5/scripts/Kbuild.install
+===================================================================
+--- klibc-1.5.orig/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/scripts/Kbuild.install 2008-02-24 15:24:28.085825030 +0100
+@@ -88,25 +88,21 @@
header:
$(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
$(Q)mkdir -p $(INSTALLROOT)$(bindir)
@@ -24,12 +26,15 @@ diff -ru klibc.clean/scripts/Kbuild.inst
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
-- $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
-+ $(Q)-set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
+ $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
$(KLIBCKERNELOBJ)/include2 ; do \
-@@ -106,7 +103,6 @@
+ [ ! -d $$r/$$d ] || \
+- cp -rfL $$r/$$d/. \
++ cp -rfd $$r/$$d/. \
+ $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \
+ done ; \
done
$(Q)cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(KLIBCARCH) asm
$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
@@ -37,91 +42,100 @@ diff -ru klibc.clean/scripts/Kbuild.inst
$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
footer: header
-diff -ru klibc.clean/usr/dash/Kbuild klibc-1.5/usr/dash/Kbuild
---- klibc.clean/usr/dash/Kbuild 2008-02-08 22:37:41.000000000 +0100
-+++ klibc-1.5/usr/dash/Kbuild 2008-02-15 12:18:08.000000000 +0100
+Index: klibc-1.5/usr/dash/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/dash/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/dash/Kbuild 2008-02-24 15:13:50.189827040 +0100
@@ -107,5 +107,3 @@
$(obj)/arith.c: $(obj)/arith.h
$(Q):
-# Targets to install
-install-y := sh.shared
-diff -ru klibc.clean/usr/gzip/Kbuild klibc-1.5/usr/gzip/Kbuild
---- klibc.clean/usr/gzip/Kbuild 2008-02-08 22:37:42.000000000 +0100
-+++ klibc-1.5/usr/gzip/Kbuild 2008-02-15 12:18:24.000000000 +0100
+Index: klibc-1.5/usr/gzip/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/gzip/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/gzip/Kbuild 2008-02-24 15:13:50.197824604 +0100
@@ -21,5 +21,3 @@
# Cleaning
targets := gzip gzip.g gunzip zcat
-# Targets to install
-install-y := gzip gunzip zcat
-diff -ru klibc.clean/usr/kinit/fstype/Kbuild klibc-1.5/usr/kinit/fstype/Kbuild
---- klibc.clean/usr/kinit/fstype/Kbuild 2008-02-08 22:37:40.000000000 +0100
-+++ klibc-1.5/usr/kinit/fstype/Kbuild 2008-02-15 12:26:20.000000000 +0100
+Index: klibc-1.5/usr/kinit/fstype/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/fstype/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/fstype/Kbuild 2008-02-24 15:13:50.201824503 +0100
@@ -21,5 +21,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
-diff -ru klibc.clean/usr/kinit/ipconfig/Kbuild klibc-1.5/usr/kinit/ipconfig/Kbuild
---- klibc.clean/usr/kinit/ipconfig/Kbuild 2008-02-08 22:37:40.000000000 +0100
-+++ klibc-1.5/usr/kinit/ipconfig/Kbuild 2008-02-15 12:26:33.000000000 +0100
+Index: klibc-1.5/usr/kinit/ipconfig/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/ipconfig/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/ipconfig/Kbuild 2008-02-24 15:13:50.205824123 +0100
@@ -27,5 +27,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
-diff -ru klibc.clean/usr/kinit/Kbuild klibc-1.5/usr/kinit/Kbuild
---- klibc.clean/usr/kinit/Kbuild 2008-02-08 22:37:40.000000000 +0100
-+++ klibc-1.5/usr/kinit/Kbuild 2008-02-15 12:18:43.000000000 +0100
+Index: klibc-1.5/usr/kinit/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/Kbuild 2008-02-24 15:13:50.209824302 +0100
@@ -33,5 +33,3 @@
subdir- := fstype ipconfig nfsmount resume run-init
-# install binary
-install-y := kinit kinit.shared
-diff -ru klibc.clean/usr/kinit/nfsmount/Kbuild klibc-1.5/usr/kinit/nfsmount/Kbuild
---- klibc.clean/usr/kinit/nfsmount/Kbuild 2008-02-08 22:37:40.000000000 +0100
-+++ klibc-1.5/usr/kinit/nfsmount/Kbuild 2008-02-15 12:26:46.000000000 +0100
+Index: klibc-1.5/usr/kinit/nfsmount/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/nfsmount/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/nfsmount/Kbuild 2008-02-24 15:13:50.213824201 +0100
@@ -23,5 +23,3 @@
clean-dirs := static shared
-# Install binary
-install-y := $(shared-y)
-diff -ru klibc.clean/usr/kinit/resume/Kbuild klibc-1.5/usr/kinit/resume/Kbuild
---- klibc.clean/usr/kinit/resume/Kbuild 2008-02-08 22:37:39.000000000 +0100
-+++ klibc-1.5/usr/kinit/resume/Kbuild 2008-02-15 12:27:01.000000000 +0100
+Index: klibc-1.5/usr/kinit/resume/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/resume/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/resume/Kbuild 2008-02-24 15:13:50.217824380 +0100
@@ -26,5 +26,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
-diff -ru klibc.clean/usr/kinit/run-init/Kbuild klibc-1.5/usr/kinit/run-init/Kbuild
---- klibc.clean/usr/kinit/run-init/Kbuild 2008-02-08 22:37:39.000000000 +0100
-+++ klibc-1.5/usr/kinit/run-init/Kbuild 2008-02-15 12:27:12.000000000 +0100
+Index: klibc-1.5/usr/kinit/run-init/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/run-init/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/run-init/Kbuild 2008-02-24 15:13:50.221824559 +0100
@@ -21,5 +21,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
-Only in klibc-1.5/usr/klibc/arch/arm: klib.list
-diff -ru klibc.clean/usr/klibc/Kbuild klibc-1.5/usr/klibc/Kbuild
---- klibc.clean/usr/klibc/Kbuild 2008-02-08 22:37:49.000000000 +0100
-+++ klibc-1.5/usr/klibc/Kbuild 2008-02-15 12:17:24.000000000 +0100
+Index: klibc-1.5/usr/klibc/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/klibc/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/klibc/Kbuild 2008-02-24 15:13:50.229824358 +0100
@@ -175,5 +175,3 @@
$(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib))
$(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
$(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib
- $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
- $(INSTALLROOT)$(SHLIBDIR)
-diff -ru klibc.clean/usr/utils/Kbuild klibc-1.5/usr/utils/Kbuild
---- klibc.clean/usr/utils/Kbuild 2008-02-08 22:37:37.000000000 +0100
-+++ klibc-1.5/usr/utils/Kbuild 2008-02-15 12:17:51.000000000 +0100
+Index: klibc-1.5/usr/utils/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/utils/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/utils/Kbuild 2008-02-24 15:13:50.229824358 +0100
@@ -64,5 +64,3 @@
# Clean deletes the static and shared dir
clean-dirs := static shared
============================================================
--- packages/klibc/klibc-utils-static_1.5.bb 712cc1a9eaaf4de058b8926a6f376e589d0c865c
+++ packages/klibc/klibc-utils-static_1.5.bb b5447c8999eb05a38a9dc43898f7b18b130f8f28
@@ -1,9 +1,7 @@ require klibc-common.inc
require klibc-common.inc
-PR = "r4"
+PR = "r5"
-SRC_URI_append_linux-gnueabi = "\
- file://klibc-config-eabi.patch;patch=1"
# We only want the static utils. klibc build both. So we install only what we want.
do_install() {
============================================================
--- packages/klibc/klibc.inc 53e4f37f521ba3c1a20198a13faa8a95f2f812b8
+++ packages/klibc/klibc.inc c62d790171545f80dae278f763a0f6b65fecec54
@@ -1,9 +1,8 @@ SRC_URI += "file://staging.patch;patch=1
require klibc-common.inc
SRC_URI += "file://staging.patch;patch=1 \
file://klibc_kexecsyscall.patch;patch=1 \
"
-SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1"
# we want only the shared programms and the lib so we chose them manually
do_install() {
============================================================
--- packages/klibc/klibc_1.5.bb 8afd19f9d2e288ae6198fe88d8c74fb36aa9b9b3
+++ packages/klibc/klibc_1.5.bb 643abab68d99c185d9d7b361de44cd819352e425
@@ -1,2 +1,2 @@ require klibc.inc
require klibc.inc
+PR = "r3"
-PR = "r1"
More information about the Openembedded-commits
mailing list