From 0ab76ac762d6064c44e0e948dd25a1e467c94055 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 9 Jul 2008 11:03:53 +0000 Subject: ffmpeg: move SRCREV to recipe so people can build the git version with optimizations for NEON --- packages/ffmpeg/ffmpeg_git.bb | 132 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 packages/ffmpeg/ffmpeg_git.bb (limited to 'packages/ffmpeg/ffmpeg_git.bb') diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb new file mode 100644 index 0000000000..c287b86623 --- /dev/null +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -0,0 +1,132 @@ +require ffmpeg.inc + +DEPENDS += "libgsm" + +PV = "0.4.9+${PR}+gitr${SRCREV}" +PR = "r9" + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_armv7a = "1" + +FFBRANCH_arm = "arm-neon" +FFBRANCH ?= "master" + +SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d" +SRCREV_arm = "4cc48b756abd09baa7b31909ebbc0c09be2c8e5a" +SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ +" + +S = "${WORKDIR}/git" +B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" + +FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math" +BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" + +EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" +EXTRA_FFCONF ?= "" + +EXTRA_OECONF = " \ + --enable-shared \ + --enable-pthreads \ + --disable-stripping \ + --enable-gpl \ + --enable-nonfree \ + --enable-postproc \ + \ + --cross-prefix=${TARGET_PREFIX} \ + --prefix=${prefix} \ + \ + --enable-x11grab \ + --enable-libfaac \ + --enable-libfaad \ + --enable-libfaadbin \ + --enable-libgsm \ + --enable-libmp3lame \ + --enable-swscale \ + --arch=${TARGET_ARCH} \ + --enable-cross-compile \ + --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-ldflags="${TARGET_LDFLAGS}" \ + --enable-hardcoded-tables \ + ${EXTRA_FFCONF} \ +" + +do_configure() { + cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true + mkdir -p ${B} + cd ${B} + ${S}/configure ${EXTRA_OECONF} + sed -i -e s:Os:O4:g ${B}/config.h +} + +do_stage() { + for lib in libavcodec libavdevice libavformat \ + libavutil libpostproc libswscale + do + oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/$lib + done + + install -d ${STAGING_INCDIR}/ffmpeg + + install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h + install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h + install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/libavcodec/avcodec.h + install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/libavcodec/opt.h + + install -m 0644 ${S}/libavdevice/avdevice.h ${STAGING_INCDIR}/ffmpeg/avdevice.h + + for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h + do + install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h + done + + for h in adler32.h avstring.h avutil.h base64.h bswap.h \ + common.h crc.h fifo.h integer.h intfloat_readwrite.h \ + log.h lzo.h mathematics.h md5.h mem.h random.h \ + rational.h sha1.h + do + install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h + install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h + done + + install -m 0644 ${S}/libswscale/swscale.h ${STAGING_INCDIR}/ffmpeg/swscale.h + install -m 0644 ${S}/libswscale/rgb2rgb.h ${STAGING_INCDIR}/ffmpeg/rgb2rgb.h + + install -d ${STAGING_INCDIR}/libpostproc + install -d ${STAGING_INCDIR}/postproc + install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h + install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h +} + +PACKAGES += "libavcodec libavcodec-dev libavcodec-dbg \ + libavdevice libavdevice-dev libavdevice-dbg \ + libavformat libavformat-dev libavformat-dbg \ + libavutil libavutil-dev libavutil-dbg \ + libpostproc libpostproc-dev libpostproc-dbg \ + libswscale libswscale-dev libswscale-dbg" + +FILES_${PN}-dev = "${includedir}" +FILES_libavcodec = "${libdir}/libavcodec*.so.*" +FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a" +FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*" + +FILES_libavdevice = "${libdir}/libavdevice*.so.*" +FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a" +FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*" + +FILES_libavformat = "${libdir}/libavformat*.so.*" +FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a" +FILES_libavformat-dbg += "${libdir}/.debug/libavformat*" + +FILES_libavutil = "${libdir}/libavutil*.so.*" +FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a" +FILES_libavutil-dbg += "${libdir}/.debug/libavutil*" + +FILES_libpostproc = "${libdir}/libpostproc*.so.*" +FILES_libpostproc-dev = "${libdir}/libpostproc*.so ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc" +FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*" + +FILES_libswscale = "${libdir}/libswscale*.so.*" +FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a" +FILES_libswscale-dbg += "${libdir}/.debug/libswscale*" -- cgit v1.2.3 From fb3c124a8efbf6dfc9b9a838b782b68c9f2aa0aa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 9 Jul 2008 21:42:59 +0000 Subject: ffmpeg git: enhance staging --- packages/ffmpeg/ffmpeg_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/ffmpeg/ffmpeg_git.bb') diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index c287b86623..41ce4ce9d9 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r9" +PR = "r10" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -79,7 +79,8 @@ do_stage() { for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h do install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h - done + install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/libavformat/$h + done for h in adler32.h avstring.h avutil.h base64.h bswap.h \ common.h crc.h fifo.h integer.h intfloat_readwrite.h \ -- cgit v1.2.3 From 83fb760ad8f0764fa81b480d85c458c80d2b8116 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 10 Jul 2008 08:34:22 +0000 Subject: ffmpeg git: adjust staging --- packages/ffmpeg/ffmpeg_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/ffmpeg/ffmpeg_git.bb') diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 41ce4ce9d9..0c9936a2f9 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -42,7 +42,7 @@ EXTRA_OECONF = " \ --enable-libfaadbin \ --enable-libgsm \ --enable-libmp3lame \ - --enable-swscale \ + --disable-swscale \ --arch=${TARGET_ARCH} \ --enable-cross-compile \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ @@ -63,7 +63,7 @@ do_stage() { for lib in libavcodec libavdevice libavformat \ libavutil libpostproc libswscale do - oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} + oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true install -d ${STAGING_INCDIR}/$lib done -- cgit v1.2.3 From d8805be5cae986e4489bb7a9a83836bd133c1615 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 11 Jul 2008 07:59:04 +0000 Subject: ffmpeg git: bump SRCREV to get rid of image curruption when using gcc 4.3.1 omapfbplay git: bump PR to use above ffmpeg --- packages/ffmpeg/ffmpeg_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/ffmpeg/ffmpeg_git.bb') diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 0c9936a2f9..294b6afc22 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r10" +PR = "r12" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -12,7 +12,7 @@ FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d" -SRCREV_arm = "4cc48b756abd09baa7b31909ebbc0c09be2c8e5a" +SRCREV_arm = "749766cea9969418633abb77b6c8677a884dfcb9" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " -- cgit v1.2.3 From e0d701ba170b9da4a9d8b6fbe25d4054c34ec632 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 13 Jul 2008 13:03:19 +0000 Subject: ffmpeg git: bump SRCREV for faster mp3 decoding --- packages/ffmpeg/ffmpeg_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/ffmpeg/ffmpeg_git.bb') diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 294b6afc22..0fb739a17d 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r12" +PR = "r13" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -12,7 +12,7 @@ FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d" -SRCREV_arm = "749766cea9969418633abb77b6c8677a884dfcb9" +SRCREV_arm = "d0e4a018bb80814e4aee450ddf9b4f6d3cb97064" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " -- cgit v1.2.3 From 3b2a3f2b9068f9ee61070efe2ea0ab660cf5a1f3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 Jul 2008 06:57:53 +0000 Subject: ffmpeg git: bump SRCREV --- packages/ffmpeg/ffmpeg_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/ffmpeg/ffmpeg_git.bb') diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 0fb739a17d..548d5a5139 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r13" +PR = "r14" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -11,8 +11,8 @@ DEFAULT_PREFERENCE_armv7a = "1" FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" -SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d" -SRCREV_arm = "d0e4a018bb80814e4aee450ddf9b4f6d3cb97064" +SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371" +SRCREV_arm = "3ea1180b31078c276783f68e153ec54cfe567977" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " -- cgit v1.2.3 From ec3798a3228ae2bba42b60ec0cc3c7fdafaf2b54 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 15 Jul 2008 13:10:47 +0000 Subject: ffmpeg, omapfbplay: bump SRCREV --- packages/ffmpeg/ffmpeg_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/ffmpeg/ffmpeg_git.bb') diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 548d5a5139..979da0362e 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r14" +PR = "r15" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -12,7 +12,7 @@ FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371" -SRCREV_arm = "3ea1180b31078c276783f68e153ec54cfe567977" +SRCREV_arm = "7137e7907e706300183c120703d4c9b46db93029" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " -- cgit v1.2.3