diff options
| -rw-r--r-- | conf/distro/chinook-compat.conf | 2 | ||||
| -rw-r--r-- | recipes/libsndfile/libsndfile1_1.0.20.bb | 10 | ||||
| -rw-r--r-- | recipes/libxine/libxine-1.1.16/ffmpeg_headers.patch | 19 | ||||
| -rw-r--r-- | recipes/libxine/libxine_1.1.16.3.bb | 6 | ||||
| -rw-r--r-- | recipes/nandlogical/files/mtd-abi.h | 152 | ||||
| -rw-r--r-- | recipes/nandlogical/files/mtd-user.h | 21 | ||||
| -rw-r--r-- | recipes/nandlogical/nandlogical-klibc-static_1.0.0.bb | 23 |
7 files changed, 228 insertions, 5 deletions
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index 8f1cfa3201..d773de449a 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -104,7 +104,7 @@ PREFERRED_VERSION_gconf = "2.6.1" # gstreamer # 0.10.13 would be correct (+ maemo patches) -PREFERRED_VERSION_gstreamer = "0.10.14" +PREFERRED_VERSION_gstreamer = "0.10.17" PREFERRED_VERSION_gst-plugins-good = "0.10.6" # 0.10.13 would be correct (+ maemo patches) PREFERRED_VERSION_gst-plugins-base = "0.10.14" diff --git a/recipes/libsndfile/libsndfile1_1.0.20.bb b/recipes/libsndfile/libsndfile1_1.0.20.bb index 5dd722369b..1458b7acfa 100644 --- a/recipes/libsndfile/libsndfile1_1.0.20.bb +++ b/recipes/libsndfile/libsndfile1_1.0.20.bb @@ -4,6 +4,8 @@ AUTHOR = "Erik de Castro Lopo" SECTION = "libs/multimedia" LICENSE = "LGPL" DEPENDS = "sqlite3" +PR = "r1" + SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \ " @@ -18,5 +20,13 @@ do_configure_prepend_arm() { ac_cv_sizeof_off_t=8 } +do_configure_prepend_chinook-compat () { + + for i in lt~obsolete.m4 ltsugar.m4 libtool.m4 ltoptions.m4 ltversion.m4 + do + rm ${S}/M4/${i} + done +} + PACKAGES =+ "${PN}-octave" FILES_${PN}-octave += "/usr/share/octave/site/m" diff --git a/recipes/libxine/libxine-1.1.16/ffmpeg_headers.patch b/recipes/libxine/libxine-1.1.16/ffmpeg_headers.patch new file mode 100644 index 0000000000..be20fe6df4 --- /dev/null +++ b/recipes/libxine/libxine-1.1.16/ffmpeg_headers.patch @@ -0,0 +1,19 @@ +Index: xine-lib-1.1.16.3/configure.ac +=================================================================== +--- xine-lib-1.1.16.3.orig/configure.ac 2009-07-29 01:27:23.448366991 +0200 ++++ xine-lib-1.1.16.3/configure.ac 2009-07-29 01:29:12.556348147 +0200 +@@ -350,14 +350,6 @@ + AC_SUBST([FFMPEG_POSTPROC_LIBS]) + AC_DEFINE([HAVE_FFMPEG], [1], [Define this if you have ffmpeg library]) + +- dnl Check presence of ffmpeg/avutil.h to see if it's old or new +- dnl style for headers. The new style would be preferred actually... +- AC_CHECK_HEADERS([ffmpeg/avutil.h]) +- AC_CHECK_HEADERS([libavutil/avutil.h]) +- if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then +- AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!]) +- fi +- + AC_MSG_RESULT([using external ffmpeg]) + else + AC_MSG_NOTICE([ diff --git a/recipes/libxine/libxine_1.1.16.3.bb b/recipes/libxine/libxine_1.1.16.3.bb index 1fe265e53c..1d7ccb2137 100644 --- a/recipes/libxine/libxine_1.1.16.3.bb +++ b/recipes/libxine/libxine_1.1.16.3.bb @@ -1,16 +1,14 @@ require libxine.inc -#fails do_configure in minimal and angstrom -DEFAULT_PREFERENCE = "-1" - PPDIR = "1.26" -PR = "r0" +PR = "r1" FILESPATHPKG .= ":libxine-1.1.16" SRC_URI += " \ file://libxine-arm-configure.patch;patch=1 \ file://iconv.patch;patch=1 \ + file://ffmpeg_headers.patch;patch=1 \ " python populate_packages_prepend () { diff --git a/recipes/nandlogical/files/mtd-abi.h b/recipes/nandlogical/files/mtd-abi.h new file mode 100644 index 0000000000..86defe175f --- /dev/null +++ b/recipes/nandlogical/files/mtd-abi.h @@ -0,0 +1,152 @@ +/* + * $Id: mtd-abi.h,v 1.13 2005/11/07 11:14:56 gleixner Exp $ + * + * Portions of MTD ABI definition which are shared by kernel and user space + */ + +#ifndef __MTD_ABI_H__ +#define __MTD_ABI_H__ + +struct erase_info_user { + uint32_t start; + uint32_t length; +}; + +struct mtd_oob_buf { + uint32_t start; + uint32_t length; + unsigned char *ptr; +}; + +#define MTD_ABSENT 0 +#define MTD_RAM 1 +#define MTD_ROM 2 +#define MTD_NORFLASH 3 +#define MTD_NANDFLASH 4 +#define MTD_DATAFLASH 6 +#define MTD_UBIVOLUME 7 + +#define MTD_WRITEABLE 0x400 /* Device is writeable */ +#define MTD_BIT_WRITEABLE 0x800 /* Single bits can be flipped */ +#define MTD_NO_ERASE 0x1000 /* No erase necessary */ +#define MTD_STUPID_LOCK 0x2000 /* Always locked after reset */ + +// Some common devices / combinations of capabilities +#define MTD_CAP_ROM 0 +#define MTD_CAP_RAM (MTD_WRITEABLE | MTD_BIT_WRITEABLE | MTD_NO_ERASE) +#define MTD_CAP_NORFLASH (MTD_WRITEABLE | MTD_BIT_WRITEABLE) +#define MTD_CAP_NANDFLASH (MTD_WRITEABLE) + +/* ECC byte placement */ +#define MTD_NANDECC_OFF 0 // Switch off ECC (Not recommended) +#define MTD_NANDECC_PLACE 1 // Use the given placement in the structure (YAFFS1 legacy mode) +#define MTD_NANDECC_AUTOPLACE 2 // Use the default placement scheme +#define MTD_NANDECC_PLACEONLY 3 // Use the given placement in the structure (Do not store ecc result on read) +#define MTD_NANDECC_AUTOPL_USR 4 // Use the given autoplacement scheme rather than using the default + +/* OTP mode selection */ +#define MTD_OTP_OFF 0 +#define MTD_OTP_FACTORY 1 +#define MTD_OTP_USER 2 + +struct mtd_info_user { + uint8_t type; + uint32_t flags; + uint32_t size; // Total size of the MTD + uint32_t erasesize; + uint32_t writesize; + uint32_t oobsize; // Amount of OOB data per block (e.g. 16) + /* The below two fields are obsolete and broken, do not use them + * (TODO: remove at some point) */ + uint32_t ecctype; + uint32_t eccsize; +}; + +struct region_info_user { + uint32_t offset; /* At which this region starts, + * from the beginning of the MTD */ + uint32_t erasesize; /* For this region */ + uint32_t numblocks; /* Number of blocks in this region */ + uint32_t regionindex; +}; + +struct otp_info { + uint32_t start; + uint32_t length; + uint32_t locked; +}; + +#define MEMGETINFO _IOR('M', 1, struct mtd_info_user) +#define MEMERASE _IOW('M', 2, struct erase_info_user) +#define MEMWRITEOOB _IOWR('M', 3, struct mtd_oob_buf) +#define MEMREADOOB _IOWR('M', 4, struct mtd_oob_buf) +#define MEMLOCK _IOW('M', 5, struct erase_info_user) +#define MEMUNLOCK _IOW('M', 6, struct erase_info_user) +#define MEMGETREGIONCOUNT _IOR('M', 7, int) +#define MEMGETREGIONINFO _IOWR('M', 8, struct region_info_user) +#define MEMSETOOBSEL _IOW('M', 9, struct nand_oobinfo) +#define MEMGETOOBSEL _IOR('M', 10, struct nand_oobinfo) +#define MEMGETBADBLOCK _IOW('M', 11, loff_t) +#define MEMSETBADBLOCK _IOW('M', 12, loff_t) +#define OTPSELECT _IOR('M', 13, int) +#define OTPGETREGIONCOUNT _IOW('M', 14, int) +#define OTPGETREGIONINFO _IOW('M', 15, struct otp_info) +#define OTPLOCK _IOR('M', 16, struct otp_info) +#define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout) +#define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats) +#define MTDFILEMODE _IO('M', 19) + +/* + * Obsolete legacy interface. Keep it in order not to break userspace + * interfaces + */ +struct nand_oobinfo { + uint32_t useecc; + uint32_t eccbytes; + uint32_t oobfree[8][2]; + uint32_t eccpos[32]; +}; + +struct nand_oobfree { + uint32_t offset; + uint32_t length; +}; + +#define MTD_MAX_OOBFREE_ENTRIES 8 +/* + * ECC layout control structure. Exported to userspace for + * diagnosis and to allow creation of raw images + */ +struct nand_ecclayout { + uint32_t eccbytes; + uint32_t eccpos[64]; + uint32_t oobavail; + struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES]; +}; + +/** + * struct mtd_ecc_stats - error correction stats + * + * @corrected: number of corrected bits + * @failed: number of uncorrectable errors + * @badblocks: number of bad blocks in this partition + * @bbtblocks: number of blocks reserved for bad block tables + */ +struct mtd_ecc_stats { + uint32_t corrected; + uint32_t failed; + uint32_t badblocks; + uint32_t bbtblocks; +}; + +/* + * Read/write file modes for access to MTD + */ +enum mtd_file_modes { + MTD_MODE_NORMAL = MTD_OTP_OFF, + MTD_MODE_OTP_FACTORY = MTD_OTP_FACTORY, + MTD_MODE_OTP_USER = MTD_OTP_USER, + MTD_MODE_RAW, +}; + +#endif /* __MTD_ABI_H__ */ diff --git a/recipes/nandlogical/files/mtd-user.h b/recipes/nandlogical/files/mtd-user.h new file mode 100644 index 0000000000..713f34d3e6 --- /dev/null +++ b/recipes/nandlogical/files/mtd-user.h @@ -0,0 +1,21 @@ +/* + * $Id: mtd-user.h,v 1.2 2004/05/05 14:44:57 dwmw2 Exp $ + * + * MTD ABI header for use by user space only. + */ + +#ifndef __MTD_USER_H__ +#define __MTD_USER_H__ + +#include <stdint.h> + +/* This file is blessed for inclusion by userspace */ +#include <mtd/mtd-abi.h> + +typedef struct mtd_info_user mtd_info_t; +typedef struct erase_info_user erase_info_t; +typedef struct region_info_user region_info_t; +typedef struct nand_oobinfo nand_oobinfo_t; +typedef struct nand_ecclayout nand_ecclayout_t; + +#endif /* __MTD_USER_H__ */ diff --git a/recipes/nandlogical/nandlogical-klibc-static_1.0.0.bb b/recipes/nandlogical/nandlogical-klibc-static_1.0.0.bb new file mode 100644 index 0000000000..8c3ca9da79 --- /dev/null +++ b/recipes/nandlogical/nandlogical-klibc-static_1.0.0.bb @@ -0,0 +1,23 @@ +require nandlogical_${PV}.bb + +SRC_URI_append = " file://nandlogical.c \ + file://mtd-user.h \ + file://mtd-abi.h \ + " +DEPENDS += "klibc" + +export CC = ${TARGET_PREFIX}klcc + +# standard oe cflags don't work with klcc +export CFLAGS = "" +export CPPFLAGS = "" +export LDFLAGS = "" + +do_configure_prepend() { + sed -i 's:<mtd/mtd-user.h>:"mtd-user.h":g' '${S}/nandlogical.c' + sed -i 's:<mtd/mtd-abi.h>:"mtd-abi.h":g' '${S}/mtd-user.h' +} + +do_compile() { + ${CC} nandlogical.c -o nandlogical ${CFLAGS} ${LDFLAGS} -static +} |