* [meta-multimedia][PATCH 0/2] Add some recipes from meta-baryon
@ 2013-09-26 23:58 Paul Eggleton
2013-09-26 23:58 ` [meta-multimedia][PATCH 1/2] faac: add recipe Paul Eggleton
2013-09-26 23:58 ` [meta-multimedia][PATCH 2/2] schroedinger: " Paul Eggleton
0 siblings, 2 replies; 3+ messages in thread
From: Paul Eggleton @ 2013-09-26 23:58 UTC (permalink / raw)
To: openembedded-devel
These recipes are about to be removed from meta-baryon as they are no
longer needed there, so update them, clean them up and move them to
meta-multimedia.
The following changes since commit 0ffc5f7ae91d06fb8e1d71e0b7cd08b94cad9060:
apache2: fix error messages when restart apache service (2013-09-26 09:35:56 +0100)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib paule/multimedia
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/multimedia
Paul Eggleton (2):
faac: add recipe
schroedinger: add recipe
.../recipes-multimedia/faac/faac_1.28.bb | 21 ++
.../recipes-multimedia/faac/files/build-fix.patch | 332 +++++++++++++++++++++
.../schroedinger/files/configure.ac.patch | 20 ++
.../schroedinger/schroedinger_1.0.11.bb | 22 ++
4 files changed, 395 insertions(+)
create mode 100644 meta-multimedia/recipes-multimedia/faac/faac_1.28.bb
create mode 100644 meta-multimedia/recipes-multimedia/faac/files/build-fix.patch
create mode 100644 meta-multimedia/recipes-multimedia/schroedinger/files/configure.ac.patch
create mode 100644 meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb
--
1.8.1.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [meta-multimedia][PATCH 1/2] faac: add recipe
2013-09-26 23:58 [meta-multimedia][PATCH 0/2] Add some recipes from meta-baryon Paul Eggleton
@ 2013-09-26 23:58 ` Paul Eggleton
2013-09-26 23:58 ` [meta-multimedia][PATCH 2/2] schroedinger: " Paul Eggleton
1 sibling, 0 replies; 3+ messages in thread
From: Paul Eggleton @ 2013-09-26 23:58 UTC (permalink / raw)
To: openembedded-devel
Originally based on the recipe from OE-Classic. Changes from that
version:
* Update to 1.28
* Add a patch from Debian to fix compilation errors
* Split out staticdev files into their own package
* Set reasonable SUMMARY instead of DESCRIPTION
* Add LIC_FILES_CHKSUM
* Drop PRIORITY and default value of S
* Rearrange recipe into logical order
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../recipes-multimedia/faac/faac_1.28.bb | 21 ++
.../recipes-multimedia/faac/files/build-fix.patch | 332 +++++++++++++++++++++
2 files changed, 353 insertions(+)
create mode 100644 meta-multimedia/recipes-multimedia/faac/faac_1.28.bb
create mode 100644 meta-multimedia/recipes-multimedia/faac/files/build-fix.patch
diff --git a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb
new file mode 100644
index 0000000..c7dcdb9
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Freeware Advanced Audio Coder (MPEG2-AAC, MPEG4-AAC)"
+SECTION = "libs"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
+ file://libfaac/coder.h;beginline=5;endline=17;md5=fa1fd6a5fa8cdc877d63a12530d273e0"
+
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${BPN}-${PV}.tar.gz \
+ file://build-fix.patch"
+
+SRC_URI[md5sum] = "80763728d392c7d789cde25614c878f6"
+SRC_URI[sha256sum] = "c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df"
+
+PACKAGES =+ "lib${PN} lib${PN}-dev"
+
+FILES_${PN} = " ${bindir}/faac "
+FILES_lib${PN} = " ${libdir}/libfaac.so.*"
+FILES_lib${PN}-dev = "${includedir}/faac.h ${includedir}/faaccfg.h ${libdir}/libfaac.so ${libdir}/libfaac.la"
+FILES_lib${PN}-staticdev = "${libdir}/libfaac.a"
+
diff --git a/meta-multimedia/recipes-multimedia/faac/files/build-fix.patch b/meta-multimedia/recipes-multimedia/faac/files/build-fix.patch
new file mode 100644
index 0000000..83cff8f
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/faac/files/build-fix.patch
@@ -0,0 +1,332 @@
+Patch fixing build error and warnings. Error consisted of redefining
+strcasestr function from string.h. Warnings consisted of deprecated conversions
+of string constants to char*, using '%llu' for type uint64_t (which on 64 bit
+systems, is defined as unsigned long int by stdint.h), and using '==' for
+equality of two strings.
+
+Patch originally from Debian.
+
+Upstream-Status: Pending
+
+==========================================================================
+--- a/common/mp4v2/mpeg4ip.h
++++ b/common/mp4v2/mpeg4ip.h
+@@ -120,14 +120,6 @@
+ #endif
+ #include <sys/param.h>
+
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char *strcasestr(const char *haystack, const char *needle);
+-#ifdef __cplusplus
+-}
+-#endif
+-
+ #define OPEN_RDWR O_RDWR
+ #define OPEN_CREAT O_CREAT
+ #define OPEN_RDONLY O_RDONLY
+@@ -135,7 +127,6 @@
+ #define closesocket close
+ #define IOSBINARY ios::bin
+
+-#if SIZEOF_LONG == 8
+ #define MAX_UINT64 -1LU
+ #define D64F "ld"
+ #define U64F "lu"
+@@ -143,15 +134,6 @@
+
+ #define TO_D64(a) (a##L)
+ #define TO_U64(a) (a##LU)
+-#else
+-#define MAX_UINT64 -1LLU
+-#define D64F "lld"
+-#define U64F "llu"
+-#define X64F "llx"
+-
+-#define TO_D64(a) (a##LL)
+-#define TO_U64(a) (a##LLU)
+-#endif
+
+ #ifdef HAVE_FPOS_T___POS
+ #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)((fpos).__pos)
+--- a/configure.in
++++ b/configure.in
+@@ -4,6 +4,9 @@
+ AM_INIT_AUTOMAKE
+
+ AM_CONFIG_HEADER(config.h)
++AH_TOP([#ifndef CONFIG_H
++#define CONFIG_H])
++AH_BOTTOM([#endif /* CONFIG_H */])
+
+ AC_ARG_WITH( mp4v2, [ --with-mp4v2 compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)
+ AC_ARG_ENABLE( drm, [ --enable-drm Digital Radio Mondiale support], enable_drm=$enableval, enable_drm=no)
+--- a/common/mp4v2/atom_avcC.cpp
++++ b/common/mp4v2/atom_avcC.cpp
+@@ -29,7 +29,7 @@
+ class SizeTableProperty : public MP4TableProperty
+ {
+ public:
+- SizeTableProperty(char *name, MP4IntegerProperty *pCountProperty) :
++ SizeTableProperty(const char *name, MP4IntegerProperty *pCountProperty) :
+ MP4TableProperty(name, pCountProperty) {};
+ protected:
+ void ReadEntry(MP4File *pFile, u_int32_t index) {
+--- a/common/mp4v2/atom_ohdr.cpp
++++ b/common/mp4v2/atom_ohdr.cpp
+@@ -21,7 +21,7 @@
+ \param useCountedFormat counted format flag.
+ \param useUnicode unicode flag.
+ */
+- OhdrMP4StringProperty(char* name, bool useCountedFormat = false,
++ OhdrMP4StringProperty(const char* name, bool useCountedFormat = false,
+ bool useUnicode = false): MP4StringProperty(name, useCountedFormat,
+ useUnicode) {
+ }
+--- a/common/mp4v2/atom_stz2.cpp
++++ b/common/mp4v2/atom_stz2.cpp
+@@ -30,7 +30,7 @@
+ class MP4HalfSizeTableProperty : public MP4TableProperty
+ {
+ public:
+- MP4HalfSizeTableProperty(char *name, MP4IntegerProperty *pCountProperty) :
++ MP4HalfSizeTableProperty(const char *name, MP4IntegerProperty *pCountProperty) :
+ MP4TableProperty(name, pCountProperty) {};
+
+ // The count is half the actual size
+--- a/common/mp4v2/mp4atom.cpp
++++ b/common/mp4v2/mp4atom.cpp
+@@ -806,7 +806,7 @@
+ AddProperty(new MP4Integer24Property("flags"));
+ }
+
+-void MP4Atom::AddReserved(char* name, u_int32_t size)
++void MP4Atom::AddReserved(const char* name, u_int32_t size)
+ {
+ MP4BytesProperty* pReserved = new MP4BytesProperty(name, size);
+ pReserved->SetReadOnly();
+--- a/common/mp4v2/mp4atom.h
++++ b/common/mp4v2/mp4atom.h
+@@ -204,7 +204,7 @@
+
+ void AddVersionAndFlags();
+
+- void AddReserved(char* name, u_int32_t size);
++ void AddReserved(const char* name, u_int32_t size);
+
+ void ExpectChildAtom(const char* name,
+ bool mandatory, bool onlyOne = true);
+--- a/common/mp4v2/mp4file.cpp
++++ b/common/mp4v2/mp4file.cpp
+@@ -718,7 +718,7 @@
+ }
+ }
+
+-void MP4File::ProtectWriteOperation(char* where)
++void MP4File::ProtectWriteOperation(const char* where)
+ {
+ if (m_mode == 'r') {
+ throw new MP4Error("operation not permitted in read mode", where);
+@@ -1274,7 +1274,7 @@
+ }
+
+ // NULL terminated list of brands which require the IODS atom
+-char *brandsWithIods[] = { "mp42",
++const char *brandsWithIods[] = { "mp42",
+ "isom",
+ NULL};
+
+@@ -2211,11 +2211,11 @@
+ for (u_int32_t i = 0; i < m_pTracks.Size(); i++) {
+ if (!strcmp(normType, m_pTracks[i]->GetType())) {
+ if (subType) {
+- if (normType == MP4_AUDIO_TRACK_TYPE) {
++ if (!strcmp(normType,MP4_AUDIO_TRACK_TYPE)) {
+ if (subType != GetTrackEsdsObjectTypeId(m_pTracks[i]->GetId())) {
+ continue;
+ }
+- } else if (normType == MP4_VIDEO_TRACK_TYPE) {
++ } else if (!strcmp(normType,MP4_VIDEO_TRACK_TYPE)) {
+ if (subType != GetTrackEsdsObjectTypeId(m_pTracks[i]->GetId())) {
+ continue;
+ }
+@@ -2278,11 +2278,11 @@
+ for (u_int32_t i = 0; i < m_pTracks.Size(); i++) {
+ if (!strcmp(normType, m_pTracks[i]->GetType())) {
+ if (subType) {
+- if (normType == MP4_AUDIO_TRACK_TYPE) {
++ if (!strcmp(normType,MP4_AUDIO_TRACK_TYPE)) {
+ if (subType != GetTrackEsdsObjectTypeId(m_pTracks[i]->GetId())) {
+ continue;
+ }
+- } else if (normType == MP4_VIDEO_TRACK_TYPE) {
++ } else if (!strcmp(normType,MP4_VIDEO_TRACK_TYPE)) {
+ if (subType != GetTrackEsdsObjectTypeId(m_pTracks[i]->GetId())) {
+ continue;
+ }
+--- a/common/mp4v2/mp4file.h
++++ b/common/mp4v2/mp4file.h
+@@ -700,7 +700,7 @@
+ const char* TempFileName();
+ void Rename(const char* existingFileName, const char* newFileName);
+
+- void ProtectWriteOperation(char* where);
++ void ProtectWriteOperation(const char* where);
+
+ void FindIntegerProperty(const char* name,
+ MP4Property** ppProperty, u_int32_t* pIndex = NULL);
+--- a/common/mp4v2/mp4property.cpp
++++ b/common/mp4v2/mp4property.cpp
+@@ -313,7 +313,7 @@
+
+ // MP4StringProperty
+
+-MP4StringProperty::MP4StringProperty(char* name,
++MP4StringProperty::MP4StringProperty(const char* name,
+ bool useCountedFormat, bool useUnicode)
+ : MP4Property(name)
+ {
+@@ -420,7 +420,7 @@
+
+ // MP4BytesProperty
+
+-MP4BytesProperty::MP4BytesProperty(char* name, u_int32_t valueSize,
++MP4BytesProperty::MP4BytesProperty(const char* name, u_int32_t valueSize,
+ u_int32_t defaultValueSize)
+ : MP4Property(name)
+ {
+@@ -549,7 +549,7 @@
+
+ // MP4TableProperty
+
+-MP4TableProperty::MP4TableProperty(char* name, MP4IntegerProperty* pCountProperty)
++MP4TableProperty::MP4TableProperty(const char* name, MP4IntegerProperty* pCountProperty)
+ : MP4Property(name)
+ {
+ m_pCountProperty = pCountProperty;
+@@ -725,7 +725,7 @@
+
+ // MP4DescriptorProperty
+
+-MP4DescriptorProperty::MP4DescriptorProperty(char* name,
++MP4DescriptorProperty::MP4DescriptorProperty(const char* name,
+ u_int8_t tagsStart, u_int8_t tagsEnd, bool mandatory, bool onlyOne)
+ : MP4Property(name)
+ {
+--- a/common/mp4v2/mp4property.h
++++ b/common/mp4v2/mp4property.h
+@@ -100,7 +100,7 @@
+
+ class MP4IntegerProperty : public MP4Property {
+ protected:
+- MP4IntegerProperty(char* name)
++ MP4IntegerProperty(const char* name)
+ : MP4Property(name) { };
+
+ public:
+@@ -118,7 +118,7 @@
+ #define MP4INTEGER_PROPERTY_DECL2(isize, xsize) \
+ class MP4Integer##xsize##Property : public MP4IntegerProperty { \
+ public: \
+- MP4Integer##xsize##Property(char* name) \
++ MP4Integer##xsize##Property(const char* name) \
+ : MP4IntegerProperty(name) { \
+ SetCount(1); \
+ m_values[0] = 0; \
+@@ -188,7 +188,7 @@
+
+ class MP4BitfieldProperty : public MP4Integer64Property {
+ public:
+- MP4BitfieldProperty(char* name, u_int8_t numBits)
++ MP4BitfieldProperty(const char* name, u_int8_t numBits)
+ : MP4Integer64Property(name) {
+ ASSERT(numBits != 0);
+ ASSERT(numBits <= 64);
+@@ -213,7 +213,7 @@
+
+ class MP4Float32Property : public MP4Property {
+ public:
+- MP4Float32Property(char* name)
++ MP4Float32Property(const char* name)
+ : MP4Property(name) {
+ m_useFixed16Format = false;
+ m_useFixed32Format = false;
+@@ -280,7 +280,7 @@
+
+ class MP4StringProperty : public MP4Property {
+ public:
+- MP4StringProperty(char* name,
++ MP4StringProperty(const char* name,
+ bool useCountedFormat = false, bool useUnicode = false);
+
+ ~MP4StringProperty();
+@@ -355,7 +355,7 @@
+
+ class MP4BytesProperty : public MP4Property {
+ public:
+- MP4BytesProperty(char* name, u_int32_t valueSize = 0,
++ MP4BytesProperty(const char* name, u_int32_t valueSize = 0,
+ u_int32_t defaultValueSize = 0);
+
+ ~MP4BytesProperty();
+@@ -419,7 +419,7 @@
+
+ class MP4TableProperty : public MP4Property {
+ public:
+- MP4TableProperty(char* name, MP4IntegerProperty* pCountProperty);
++ MP4TableProperty(const char* name, MP4IntegerProperty* pCountProperty);
+
+ ~MP4TableProperty();
+
+@@ -469,7 +469,7 @@
+
+ class MP4DescriptorProperty : public MP4Property {
+ public:
+- MP4DescriptorProperty(char* name = NULL,
++ MP4DescriptorProperty(const char* name = NULL,
+ u_int8_t tagsStart = 0, u_int8_t tagsEnd = 0,
+ bool mandatory = false, bool onlyOne = false);
+
+@@ -531,7 +531,7 @@
+
+ class MP4QosQualifierProperty : public MP4DescriptorProperty {
+ public:
+- MP4QosQualifierProperty(char* name = NULL,
++ MP4QosQualifierProperty(const char* name = NULL,
+ u_int8_t tagsStart = 0, u_int8_t tagsEnd = 0,
+ bool mandatory = false, bool onlyOne = false) :
+ MP4DescriptorProperty(name, tagsStart, tagsEnd, mandatory, onlyOne) { }
+--- a/common/mp4v2/mp4track.cpp
++++ b/common/mp4v2/mp4track.cpp
+@@ -1360,7 +1360,7 @@
+ }
+ }
+
+-MP4Atom* MP4Track::AddAtom(char* parentName, char* childName)
++MP4Atom* MP4Track::AddAtom(const char* parentName, const char* childName)
+ {
+ MP4Atom* pChildAtom = MP4Atom::CreateAtom(childName);
+
+--- a/common/mp4v2/mp4track.h
++++ b/common/mp4v2/mp4track.h
+@@ -168,7 +168,7 @@
+ void UpdateSyncSamples(MP4SampleId sampleId,
+ bool isSyncSample);
+
+- MP4Atom* AddAtom(char* parentName, char* childName);
++ MP4Atom* AddAtom(const char* parentName, const char* childName);
+
+ void UpdateDurations(MP4Duration duration);
+ MP4Duration ToMovieDuration(MP4Duration trackDuration);
+--- a/common/mp4v2/ocidescriptors.cpp
++++ b/common/mp4v2/ocidescriptors.cpp
+@@ -171,7 +171,7 @@
+
+ class MP4CreatorTableProperty : public MP4TableProperty {
+ public:
+- MP4CreatorTableProperty(char* name, MP4Integer8Property* pCountProperty) :
++ MP4CreatorTableProperty(const char* name, MP4Integer8Property* pCountProperty) :
+ MP4TableProperty(name, pCountProperty) {
+ };
+ protected:
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [meta-multimedia][PATCH 2/2] schroedinger: add recipe
2013-09-26 23:58 [meta-multimedia][PATCH 0/2] Add some recipes from meta-baryon Paul Eggleton
2013-09-26 23:58 ` [meta-multimedia][PATCH 1/2] faac: add recipe Paul Eggleton
@ 2013-09-26 23:58 ` Paul Eggleton
1 sibling, 0 replies; 3+ messages in thread
From: Paul Eggleton @ 2013-09-26 23:58 UTC (permalink / raw)
To: openembedded-devel
Originally based on the recipe from OE-Classic. Changes from that
version:
* Remove packaging of gstreamer plugin that was removed in 1.09
* Inherit pkgconfig since pkg-config is being used
* Set more appropriate LICENSE
* Add LIC_FILES_CHKSUM
* Add SUMMARY
* Optimise out inc file since it doesn't seem particularly useful to
have one for this recipe
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../schroedinger/files/configure.ac.patch | 20 ++++++++++++++++++++
.../schroedinger/schroedinger_1.0.11.bb | 22 ++++++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 meta-multimedia/recipes-multimedia/schroedinger/files/configure.ac.patch
create mode 100644 meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb
diff --git a/meta-multimedia/recipes-multimedia/schroedinger/files/configure.ac.patch b/meta-multimedia/recipes-multimedia/schroedinger/files/configure.ac.patch
new file mode 100644
index 0000000..2ed8d22
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/schroedinger/files/configure.ac.patch
@@ -0,0 +1,20 @@
+Use the version of orcc in the sysroot not the one from the host
+
+Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
+Index: schroedinger-1.0.9/configure.ac
+===================================================================
+--- schroedinger-1.0.9.orig/configure.ac
++++ schroedinger-1.0.9/configure.ac
+@@ -54,7 +54,7 @@ if test "x${HAVE_ORC}" != xyes ; then
+ AC_ERROR([orc-0.4 >= $ORC_VER is required])
+ fi
+ SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER"
+-ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
++ORCC=$STAGING_DIR`$PKG_CONFIG --variable=orcc orc-0.4`
+ AC_SUBST(ORCC)
+
+ AC_ARG_WITH([thread],
diff --git a/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb
new file mode 100644
index 0000000..c338903
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Dirac compressed video encoder/decoder"
+HOMEPAGE = "http://schrodinger.sourceforge.net/"
+LICENSE = "MPL-1.1 | GPLv2 | LGPLv2 | MIT"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d91a46405fc074b88c963cc4f2a0aae9 \
+ file://COPYING.GPL;md5=e181e3b7c66f5f96921d813c1074f833 \
+ file://COPYING.LGPL;md5=38c893e21baec4cd75ad800ba9e2410a \
+ file://COPYING.MIT;md5=8b345371b3536b4ce37ead1eafc88221 \
+ file://COPYING.MPL;md5=0117647fecb9a932c25a7bbfc0333c37"
+
+DEPENDS = "liboil orc-native orc"
+
+SRC_URI = "http://www.diracvideo.org/download/schroedinger/${BP}.tar.gz \
+ file://configure.ac.patch"
+
+SRC_URI[md5sum] = "da6af08e564ca1157348fb8d92efc891"
+SRC_URI[sha256sum] = "1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8cc9f912"
+
+EXTRA_OECONF += "STAGING_DIR=${STAGING_DIR_NATIVE}"
+
+inherit autotools pkgconfig
+
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-26 23:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-26 23:58 [meta-multimedia][PATCH 0/2] Add some recipes from meta-baryon Paul Eggleton
2013-09-26 23:58 ` [meta-multimedia][PATCH 1/2] faac: add recipe Paul Eggleton
2013-09-26 23:58 ` [meta-multimedia][PATCH 2/2] schroedinger: " Paul Eggleton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox