Skip to contentSkip to conversation

libraw1394: add recipe

PATCH Superseded Khem Raj 4 participants 13 messages Oct 13, 2013 – Oct 16, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/6 libraw1394: add recipe

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

---
 meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb
meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb new file +11 -0
new file mode 100644
index 0000000..b0b4a53
@@ -0,0 +1,11 @@
+DESCRIPTION = "base library for low-level IEEE 1394 accesses"
+HOMEPAGE = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394"
+SECTION = "libs"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499"
+
+SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.gz"
+SRC_URI[md5sum] = "faf6b18a92075d80e45b603f9a659670"
+SRC_URI[sha256sum] = "f83268b3f5d37e8d42ae9881c099b55839b70ac0af71549be7ef6af2578e809a"
+
+inherit autotools
Signature · 1 line
1.8.3.2
author
#1 lore raw

PATCH 2/6 libdc1394: add recipe

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

---
 .../libdc1394/files/install_examples.patch           | 14 ++++++++++++++
 .../recipes-multimedia/libdc1394/libdc1394_git.bb    | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100755 meta-oe/recipes-multimedia/libdc1394/files/install_examples.patch
 create mode 100755 meta-oe/recipes-multimedia/libdc1394/libdc1394_git.bb
meta-oe/recipes-multimedia/libdc1394/files/install_examples.patch new file +14 -0
new file mode 100755
index 0000000..89133ad
@@ -0,0 +1,14 @@
+Index: libdc1394/examples/Makefile.am
+===================================================================
+--- libdc1394.orig/examples/Makefile.am	2012-06-30 17:50:46.000000000 -0700
++++ libdc1394/examples/Makefile.am	2012-06-30 19:02:13.822646430 -0700
+@@ -36,8 +36,7 @@
+ AM_LDFLAGS = -framework CoreFoundation -framework Carbon
+ endif
+ 
+-noinst_PROGRAMS = $(A)
+-bin_PROGRAMS = $(B)
++bin_PROGRAMS = $(A) $(B)
+ 
+ LDADD = ../dc1394/libdc1394.la
+ 
meta-oe/recipes-multimedia/libdc1394/libdc1394_git.bb new file +20 -0
new file mode 100755
index 0000000..87a12bd
@@ -0,0 +1,20 @@
+DESCRIPTION = "Capture and control API for IIDC compliant cameras"
+HOMEPAGE = "http://sourceforge.net/projects/libdc1394/"
+SECTION = "libs"
+LICENSE = "LGPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64"
+DEPENDS += "libxv virtual/libsdl virtual/libx11 libusb1 libraw1394"
+
+PV = "2.2.1+gitr${SRCPV}"
+
+SRCREV = "b90342933b4b48634b98b73805f47bd25ed5857e"
+
+SRC_URI = "git://git.code.sf.net/p/libdc1394/code;branch=master;protocol=git \
+           file://install_examples.patch \
+          "
+
+S = "${WORKDIR}/git/${PN}"
+
+inherit autotools pkgconfig sdl
+
+EXTRA_OECONF += "--disable-doxygen-doc"
Signature · 1 line
1.8.3.2
author
#2 lore raw

PATCH 3/6 coriander: add recipe

In reply to Khem Raj

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

---
 .../coriander/coriander/cross-compile.patch             | 17 +++++++++++++++++
 meta-oe/recipes-multimedia/coriander/coriander_2.0.2.bb | 15 +++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/coriander/coriander/cross-compile.patch
 create mode 100755 meta-oe/recipes-multimedia/coriander/coriander_2.0.2.bb
meta-oe/recipes-multimedia/coriander/coriander/cross-compile.patch new file +17 -0
new file mode 100644
index 0000000..49350fe
@@ -0,0 +1,17 @@
+In a cross compile environment adding paths like /usr are not correct.
+With this patch we make it so that its relative to sysroot if the compiler
+defines one.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+Index: a/src/Makefile.am
+===================================================================
+--- a/src/Makefile.am	2013-02-08 22:35:08.000000000 -0800
++++ b/src/Makefile.am	2013-10-13 01:31:38.812869080 -0700
+@@ -33,5 +33,5 @@
+ 	video_encode.c video_encode.h \
+ 	subtitles.c subtitles.h 
+ 
+-coriander_LDADD = -L/usr/X11R6/lib/ @PACKAGE_LIBS@ $(INTLLIBS) $(LIBTIFF_LIBS) $(FTPLIB_LIBS) $(SDLLIB_LIBS) $(LIBDC_LIBS) $(LIBRAW_LIBS) $(XV_LIBS) $(COR_LFS_LDFLAGS) -lgthread-2.0 $(FFMPEG_LIBS) $(X11_LIBS)
++coriander_LDADD = -L=/usr/X11R6/lib/ @PACKAGE_LIBS@ $(INTLLIBS) $(LIBTIFF_LIBS) $(FTPLIB_LIBS) $(SDLLIB_LIBS) $(LIBDC_LIBS) $(LIBRAW_LIBS) $(XV_LIBS) $(COR_LFS_LDFLAGS) -lgthread-2.0 $(FFMPEG_LIBS) $(X11_LIBS)
+ 
meta-oe/recipes-multimedia/coriander/coriander_2.0.2.bb new file +15 -0
new file mode 100755
index 0000000..587055d
@@ -0,0 +1,15 @@
+DESCRIPTION = "Control and capture GUI for IIDC compliant cameras"
+HOMEPAGE = "http://damien.douxchamps.net/ieee1394/coriander/"
+SECTION = "applications"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+DEPENDS = "gtk+ libgnomeui libraw1394 libdc1394 libxv"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${PN}/coriander-2/${PV}/${P}.tar.gz \
+           file://cross-compile.patch \
+          "
+
+SRC_URI[md5sum] = "431d98fb013217681f97ade168201fb8"
+SRC_URI[sha256sum] = "5c7fd31cb58d398e2742352bf1ffbd2ca22e06686c6668ecfd437735c2b79123"
+
+inherit autotools gettext sdl
Signature · 1 line
1.8.3.2
author
#3 lore raw

PATCH 4/6 libmikmod: Upgrade libmikmod_3.2.0.bb -> libmikmod_3.3.2.bb

In reply to Khem Raj
---
 .../mikmod/libmikmod/autofoo.patch                 |  16 --
 .../mikmod/libmikmod/ldflags.patch                 |  12 --
 .../recipes-multimedia/mikmod/libmikmod/m4.patch   | 197 ---------------------
 .../libmikmod/obsolete_automake_macros.patch       |  15 --
 .../{libmikmod_3.2.0.bb => libmikmod_3.3.2.bb}     |   9 +-
 5 files changed, 2 insertions(+), 247 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch
 rename meta-oe/recipes-multimedia/mikmod/{libmikmod_3.2.0.bb => libmikmod_3.3.2.bb} (68%)
meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch deleted +0 -16
deleted file mode 100644
index 22d8170..0000000
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libmikmod-3.2.0-beta2/configure.in~autofoo
-+++ libmikmod-3.2.0-beta2/configure.in
-@@ -415,8 +415,6 @@
- 
- AC_CHECK_FUNCS(setenv snprintf srandom)
- AC_REPLACE_FUNCS(strcasecmp strdup strstr)
--# Change extension, as we use libtool
--LIBOBJS="`echo $LIBOBJS|sed -e 's/\.o/\.lo/g'`"
- 
- AC_HEADER_EGREP(srandom,math.h,AC_DEFINE(SRANDOM_IN_MATH_H))
- 
meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch deleted +0 -12
deleted file mode 100644
index de31139..0000000
@@ -1,12 +0,0 @@
-diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in libmikmod-3.1.12/libmikmod/Makefile.in
---- libmikmod-3.1.12.orig/libmikmod/Makefile.in	2004-01-21 17:43:52.000000000 +0000
-+++ libmikmod-3.1.12/libmikmod/Makefile.in	2009-04-02 11:28:01.000000000 +0000
-@@ -72,7 +72,7 @@
- 	rm -f Makefile
- 
- $(LIB): $(OBJ)
--	$(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
- 
- dl_hpux.lo:	$(top_srcdir)/dlapi/dl_hpux.c \
- 			$(top_srcdir)/dlapi/dlfcn.h
meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch deleted +0 -197

197 lines not on this page · raw message

meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch deleted +0 -15
deleted file mode 100644
index 082bb04..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted (https://sourceforge.net/tracker/?func=detail&aid=3599281&group_id=40531&atid=428227)
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurd libmikmod-3.1.12/configure.in libmikmod-3.1.12/configure.in
---- libmikmod-3.1.12/configure.in	2007-12-15 11:22:57.000000000 +0200
-+++ libmikmod-3.1.12/configure.in	2013-01-03 07:26:10.662775603 +0200
-@@ -13,7 +13,7 @@
- LIBMIKMOD_VERSION=$LIBMIKMOD_MAJOR_VERSION.$LIBMIKMOD_MINOR_VERSION.$LIBMIKMOD_MICRO_VERSION$BETA
-
- AM_INIT_AUTOMAKE(libmikmod,$LIBMIKMOD_VERSION)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_MAINTAINER_MODE
-
- # ==============================================================
meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb renamed from meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb +2 -7
similarity index 68%
rename from meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb
rename to meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb
index b1ebf97..4ab293f 100644
@@ -7,14 +7,9 @@ DEPENDS = "alsa-lib texinfo"
 
 SRC_URI = "\
     http://mikmod.shlomifish.org/files/${P}.tar.gz \
-    file://m4.patch \
-    file://autofoo.patch \
-    file://ldflags.patch \
-    file://obsolete_automake_macros.patch \
 "
-
-SRC_URI[md5sum] = "96e9820d72a41fe27ff304071739696c"
-SRC_URI[sha256sum] = "734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e"
+SRC_URI[md5sum] = "60ac77a804d082230df3009af11ef44f"
+SRC_URI[sha256sum] = "2311b209255bf24e95161907a16778cb054ac6d447fd8d05f1f0e41a555c7580"
 
 inherit autotools binconfig lib_package
 
Signature · 1 line
1.8.3.2
#4 lore raw

Re: [meta-oe][PATCH 4/6] libmikmod: Upgrade libmikmod_3.2.0.bb -> libmikmod_3.3.2.bb

Quoted 289 lines · Khem Raj
---
 .../mikmod/libmikmod/autofoo.patch                 |  16 --
 .../mikmod/libmikmod/ldflags.patch                 |  12 --
 .../recipes-multimedia/mikmod/libmikmod/m4.patch   | 197 ---------------------
 .../libmikmod/obsolete_automake_macros.patch       |  15 --
 .../{libmikmod_3.2.0.bb => libmikmod_3.3.2.bb}     |   9 +-
 5 files changed, 2 insertions(+), 247 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch
 rename meta-oe/recipes-multimedia/mikmod/{libmikmod_3.2.0.bb => libmikmod_3.3.2.bb} (68%)
meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch deleted +0 -16
deleted file mode 100644
index 22d8170..0000000
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libmikmod-3.2.0-beta2/configure.in~autofoo
-+++ libmikmod-3.2.0-beta2/configure.in
-@@ -415,8 +415,6 @@
- 
- AC_CHECK_FUNCS(setenv snprintf srandom)
- AC_REPLACE_FUNCS(strcasecmp strdup strstr)
--# Change extension, as we use libtool
--LIBOBJS="`echo $LIBOBJS|sed -e 's/\.o/\.lo/g'`"
- 
- AC_HEADER_EGREP(srandom,math.h,AC_DEFINE(SRANDOM_IN_MATH_H))
- 
meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch deleted +0 -12
deleted file mode 100644
index de31139..0000000
@@ -1,12 +0,0 @@
-diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in libmikmod-3.1.12/libmikmod/Makefile.in
---- libmikmod-3.1.12.orig/libmikmod/Makefile.in	2004-01-21 17:43:52.000000000 +0000
-+++ libmikmod-3.1.12/libmikmod/Makefile.in	2009-04-02 11:28:01.000000000 +0000
-@@ -72,7 +72,7 @@
- 	rm -f Makefile
- 
- $(LIB): $(OBJ)
--	$(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
- 
- dl_hpux.lo:	$(top_srcdir)/dlapi/dl_hpux.c \
- 			$(top_srcdir)/dlapi/dlfcn.h
meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch deleted +0 -197
deleted file mode 100644
index ac7f2d7..0000000
@@ -1,197 +0,0 @@
---- /dev/null
-+++ libmikmod-3.2.0-beta2/m4/esd.m4
-@@ -0,0 +1,194 @@
-+# Configure paths for ESD
-+# Manish Singh    98-9-30
-+# stolen back from Frank Belew
-+# stolen from Manish Singh
-+# Shamelessly stolen from Owen Taylor
-+
-+dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
-+dnl
-+AC_DEFUN(AM_PATH_ESD,
-+[dnl 
-+dnl Get the cflags and libraries from the esd-config script
-+dnl
-+AC_ARG_WITH(esd-prefix,[  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)],
-+            esd_prefix="$withval", esd_prefix="")
-+AC_ARG_WITH(esd-exec-prefix,[  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
-+            esd_exec_prefix="$withval", esd_exec_prefix="")
-+AC_ARG_ENABLE(esdtest, [  --disable-esdtest       Do not try to compile and run a test ESD program],
-+		    , enable_esdtest=yes)
-+
-+  if test x$esd_exec_prefix != x ; then
-+     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-+     if test x${ESD_CONFIG+set} != xset ; then
-+        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
-+     fi
-+  fi
-+  if test x$esd_prefix != x ; then
-+     esd_args="$esd_args --prefix=$esd_prefix"
-+     if test x${ESD_CONFIG+set} != xset ; then
-+        ESD_CONFIG=$esd_prefix/bin/esd-config
-+     fi
-+  fi
-+
-+  AC_PATH_PROG(ESD_CONFIG, esd-config, no)
-+  min_esd_version=ifelse([$1], ,0.2.7,$1)
-+  AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
-+  no_esd=""
-+  if test "$ESD_CONFIG" = "no" ; then
-+    no_esd=yes
-+  else
-+    AC_LANG_SAVE
-+    AC_LANG_C
-+    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
-+    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-+
-+    esd_major_version=`$ESD_CONFIG $esd_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_esdtest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $ESD_CFLAGS"
-+      LIBS="$LIBS $ESD_LIBS"
-+dnl
-+dnl Now check if the installed ESD is sufficiently new. (Also sanity
-+dnl checks the results of esd-config to some extent
-+dnl
-+      rm -f conf.esdtest
-+      AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <esd.h>
-+
-+char*
-+my_strdup (char *str)
-+{
-+  char *new_str;
-+  
-+  if (str)
-+    {
-+      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-+      strcpy (new_str, str);
-+    }
-+  else
-+    new_str = NULL;
-+  
-+  return new_str;
-+}
-+
-+int main ()
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  system ("touch conf.esdtest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = my_strdup("$min_esd_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_esd_version");
-+     exit(1);
-+   }
-+
-+   if (($esd_major_version > major) ||
-+      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
-+      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
-+    {
-+      return 0;
-+    }
-+  else
-+    {
-+      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
-+      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
-+      printf("*** best to upgrade to the required version.\n");
-+      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
-+      printf("*** to point to the correct copy of esd-config, and remove the file\n");
-+      printf("*** config.cache before re-running configure\n");
-+      return 1;
-+    }
-+}
-+
-+],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+       AC_LANG_RESTORE
-+     fi
-+  fi
-+  if test "x$no_esd" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$ESD_CONFIG" = "no" ; then
-+       echo "*** The esd-config script installed by ESD could not be found"
-+       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the ESD_CONFIG environment variable to the"
-+       echo "*** full path to esd-config."
-+     else
-+       if test -f conf.esdtest ; then
-+        :
-+       else
-+          echo "*** Could not run ESD test program, checking why..."
-+          CFLAGS="$CFLAGS $ESD_CFLAGS"
-+          LIBS="$LIBS $ESD_LIBS"
-+          AC_LANG_SAVE
-+          AC_LANG_C
-+          AC_TRY_LINK([
-+#include <stdio.h>
-+#include <esd.h>
-+],      [ return 0; ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding ESD or finding the wrong"
-+          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
-+          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
-+          echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+          AC_LANG_RESTORE
-+       fi
-+     fi
-+     ESD_CFLAGS=""
-+     ESD_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(ESD_CFLAGS)
-+  AC_SUBST(ESD_LIBS)
-+  rm -f conf.esdtest
-+])
-+
-+dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]])
-+dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
-+dnl
-+AC_DEFUN(AM_ESD_SUPPORTS_MULTIPLE_RECORD,
-+[dnl
-+  AC_MSG_NOTICE([whether installed esd version supports multiple recording clients])
-+  ac_save_ESD_CFLAGS="$ESD_CFLAGS"
-+  ac_save_ESD_LIBS="$ESD_LIBS"
-+  AM_PATH_ESD(0.2.21,
-+    ifelse([$1], , [
-+      AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true)
-+      AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1,
-+	[Define if you have esound with support of multiple recording clients.])],
-+    [$1]),
-+    ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2])
-+    if test "x$ac_save_ESD_CFLAGS" != x ; then
-+       ESD_CFLAGS="$ac_save_ESD_CFLAGS"
-+    fi
-+    if test "x$ac_save_ESD_LIBS" != x ; then
-+       ESD_LIBS="$ac_save_ESD_LIBS"
-+    fi
-+  )
-+])
meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch deleted +0 -15
deleted file mode 100644
index 082bb04..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted (https://sourceforge.net/tracker/?func=detail&aid=3599281&group_id=40531&atid=428227)
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurd libmikmod-3.1.12/configure.in libmikmod-3.1.12/configure.in
---- libmikmod-3.1.12/configure.in	2007-12-15 11:22:57.000000000 +0200
-+++ libmikmod-3.1.12/configure.in	2013-01-03 07:26:10.662775603 +0200
-@@ -13,7 +13,7 @@
- LIBMIKMOD_VERSION=$LIBMIKMOD_MAJOR_VERSION.$LIBMIKMOD_MINOR_VERSION.$LIBMIKMOD_MICRO_VERSION$BETA
-
- AM_INIT_AUTOMAKE(libmikmod,$LIBMIKMOD_VERSION)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_MAINTAINER_MODE
-
- # ==============================================================
meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb renamed from meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb +0 -0
similarity index 68%
rename from meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb
rename to meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb
index b1ebf97..4ab293f 100644
@@ -7,14 +7,9 @@ DEPENDS = "alsa-lib texinfo"
 
 SRC_URI = "\
     http://mikmod.shlomifish.org/files/${P}.tar.gz \

meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb DEPENDS = "alsa-lib texinfo" · line 12

Quoted 10 lines
meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb renamed from meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb +2 -7
-    file://m4.patch \
-    file://autofoo.patch \
-    file://ldflags.patch \
-    file://obsolete_automake_macros.patch \
 "
-
-SRC_URI[md5sum] = "96e9820d72a41fe27ff304071739696c"
-SRC_URI[sha256sum] = "734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e"
+SRC_URI[md5sum] = "60ac77a804d082230df3009af11ef44f"
+SRC_URI[sha256sum] = "2311b209255bf24e95161907a16778cb054ac6d447fd8d05f1f0e41a555c7580"

It looks like 3.3.2 archive was removed today and there is only 3.3.3.

Old is still available on proper SF mirror:
http://sourceforge.net/projects/mikmod/files/libmikmod/3.3.2/

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#5 lore raw

Re: [meta-oe][PATCH 4/6] libmikmod: Upgrade libmikmod_3.2.0.bb -> libmikmod_3.3.2.bb

Quoted 92 lines · Martin Jansa
Quoted 5 lines · Khem Raj
---
 .../mikmod/libmikmod/autofoo.patch                 |  16 --
 .../mikmod/libmikmod/ldflags.patch                 |  12 --
 .../recipes-multimedia/mikmod/libmikmod/m4.patch   | 197

---------------------

Quoted 4 lines
 .../libmikmod/obsolete_automake_macros.patch       |  15 --
 .../{libmikmod_3.2.0.bb => libmikmod_3.3.2.bb}     |   9 +-
 5 files changed, 2 insertions(+), 247 deletions(-)
 delete mode 100644

meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch

Quoted 1 line
 delete mode 100644

meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch

Quoted 2 lines
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch
 delete mode 100644

meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch

Quoted 1 line
 rename meta-oe/recipes-multimedia/mikmod/{libmikmod_3.2.0.bb =>

libmikmod_3.3.2.bb} (68%)

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch

Review

Quoted 22 lines

deleted file mode 100644
index 22d8170..0000000

meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch deleted +0 -16
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libmikmod-3.2.0-beta2/configure.in~autofoo
-+++ libmikmod-3.2.0-beta2/configure.in
-@@ -415,8 +415,6 @@
-
- AC_CHECK_FUNCS(setenv snprintf srandom)
- AC_REPLACE_FUNCS(strcasecmp strdup strstr)
--# Change extension, as we use libtool
--LIBOBJS="`echo $LIBOBJS|sed -e 's/\.o/\.lo/g'`"
-
- AC_HEADER_EGREP(srandom,math.h,AC_DEFINE(SRANDOM_IN_MATH_H))
-
(quoted diff) +0 -0

b/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch

meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch line 1

Quoted 6 lines

deleted file mode 100644
index de31139..0000000

meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch deleted +0 -1
@@ -1,12 +0,0 @@
-diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in

libmikmod-3.1.12/libmikmod/Makefile.in

meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch line 2

Quoted 1 line
meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch deleted +0 -1
---- libmikmod-3.1.12.orig/libmikmod/Makefile.in      2004-01-21

17:43:52.000000000 +0000

meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch line 3

Quoted 1 line
meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch deleted +0 -1
-+++ libmikmod-3.1.12/libmikmod/Makefile.in   2009-04-02

11:28:01.000000000 +0000

meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch

Quoted 5 lines
meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch deleted +0 -5
-@@ -72,7 +72,7 @@
-     rm -f Makefile
-
- $(LIB): $(OBJ)
--    $(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ)

$(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)

meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch line 9

Quoted 1 line
meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch deleted +0 -1
-+    $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@

$(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)

Review

Quoted 4 lines
meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch deleted +0 -3
-
- dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \
-                     $(top_srcdir)/dlapi/dlfcn.h
(quoted diff) +0 -0

b/meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch

Quoted 5 lines

deleted file mode 100644
index ac7f2d7..0000000

meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch line 10

Quoted 10 lines
meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch deleted +0 -10
@@ -1,197 +0,0 @@
---- /dev/null
-+++ libmikmod-3.2.0-beta2/m4/esd.m4
-@@ -0,0 +1,194 @@
-+# Configure paths for ESD
-+# Manish Singh    98-9-30
-+# stolen back from Frank Belew
-+# stolen from Manish Singh
-+# Shamelessly stolen from Owen Taylor
-+
-+dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [,

ACTION-IF-NOT-FOUND]]])

meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch

Quoted 7 lines
meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch deleted +0 -7
-+dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
-+dnl
-+AC_DEFUN(AM_PATH_ESD,
-+[dnl
-+dnl Get the cflags and libraries from the esd-config script
-+dnl
-+AC_ARG_WITH(esd-prefiIt looks like 3.3.2 archive was removed today and
Quoted 4 lines

there is only 3.3.3.

Old is still available on proper SF mirror:
http://sourceforge.net/projects/mikmod/files/libmikmod/3.3.2/

Hmm I will update it to 3.3.3 and resend

Quoted 4 lines

--
Martin 'JaMa' Jansa jabber: [email protected] <javascript:;>

author
#6 lore raw

PATCH 5/6 opencv: Upgrade to latest on 2.4 branch

In reply to Khem Raj
---
 meta-oe/recipes-support/opencv/opencv_2.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/opencv/opencv_2.4.bb +2 -2
index ccb26e0..9dd9cd0 100644
@@ -9,12 +9,12 @@ ARM_INSTRUCTION_SET = "arm"
 
 DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0"
 
-SRCREV = "6fae07ba8867b8fd2c53344a774aab669afa7c5e"
+SRCREV = "c5afaa4e8dfe507e87531f7688b9cf65c1f701c6"
 SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
            file://opencv-fix-pkgconfig-generation.patch \
 "
 
-PV = "2.4.3+git${SRCPV}"
+PV = "2.4.6+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
1.8.3.2
author
#7 lore raw

PATCH 6/6 libgnomeui: Depend on libgnome-keyring not gnome-keyring

In reply to Khem Raj

libgnomeui needs gnome-keyring-1 which comes from libgnome-keyring

Fixes errors like below

| configure: error: Package requirements ( libxml-2.0 >= 2.4.20
libgnome-2.0 >= 2.13.7 libgnomecanvas-2.0 >= 2.0.0 libbonoboui-2.0

Quoted 1 line

= 2.13.1 gconf-2.0 >= 1.1.11 pango >= 1.1.2 glib-2.0 >= 2.16.0

|   gio-2.0 >= 2.16.0
|   gnome-vfs-2.0 >= 2.7.3   gnome-keyring-1 >= 0.4) were not met:
|
| No package 'gnome-keyring-1' found
---
 meta-gnome/recipes-gnome/libgnome/libgnomeui.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/libgnome/libgnomeui.inc +1 -1
index 8f55909..b000d72 100644
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
 
 SECTION = "x11/gnome/libs"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+DEPENDS = "libgnome libgnomecanvas libbonoboui libgnome-keyring"
 
 inherit gnome 
 
Signature · 1 line
1.8.3.2
#8 lore raw
In reply to Khem Raj
Quoted 8 lines · On Sunday 13 October 2013 01:43:50 Khem Raj wrote:

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

---
 meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb | 11 +++++++++++

Could these multimedia recipes go into meta-multimedia instead of meta-oe?

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
author
#9 lore raw
Quoted 11 lines · Paul Eggleton
Quoted 8 lines · On Sunday 13 October 2013 01:43:50 Khem Raj wrote:

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

---
meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb | 11 +++++++++++

Could these multimedia recipes go into meta-multimedia instead of meta-oe?

Its ok to put them into meta-multimedia, but they depend on meta-oe a lot may be more recipes like opencv should be moved as well.

Martin, do you need a fresh set of patches for it or can you handle the move from meta-oe -> meta-multimedia

Quoted 8 lines

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#10 lore raw
Quoted 13 lines · Khem Raj
Quoted 10 lines · Paul Eggleton
Quoted 8 lines · On Sunday 13 October 2013 01:43:50 Khem Raj wrote:

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

---
meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb | 11 +++++++++++

Quoted 7 lines
Quoted 1 line

Could these multimedia recipes go into meta-multimedia instead of meta-oe?

Its ok to put them into meta-multimedia, but they depend on meta-oe a lot may be more recipes like opencv should be moved as well.

Martin, do you need a fresh set of patches for it or can you handle the move from meta-oe -> meta-multimedia

If you're going to move opencv as well, then please send new fresh set of patches. Thanks.

Quoted 14 lines
Quoted 9 lines

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#11 lore raw
In reply to Paul Eggleton

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-10-13 13:10, Paul Eggleton schreef:

Quoted 5 lines · On Sunday 13 October 2013 01:43:50 Khem Raj wrote:
Quoted 4 lines

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

Quoted 7 lines
Quoted 4 lines

Raj <[email protected]> --- meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb | 11
+++++++++++

Could these multimedia recipes go into meta-multimedia instead of meta-oe?

FWIW, libraw1394 is the libusb for firewire, so it's not multimedia related, the other recipes like coriander and mikmod are. I'm not sure I'd put opencv in the multimedia category, though.

regards,

Koen

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFSW+gkMkyGM64RGpERAigBAJ9ZVwxmHdO0BWF0dS1Ujk/3Zc7s5QCfU5DG 9HXtdaLlOUKJIfNhw1HUNf0=
=YFga
-----END PGP SIGNATURE-----

#12 lore raw
Quoted 11 lines · On Monday 14 October 2013 14:48:36 Koen Kooi wrote:

Op 13-10-13 13:10, Paul Eggleton schreef:

Quoted 10 lines · On Sunday 13 October 2013 01:43:50 Khem Raj wrote:
Quoted 8 lines

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

Raj <[email protected]> --- meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb | 11
+++++++++++

Quoted 6 lines
Quoted 2 lines

Could these multimedia recipes go into meta-multimedia instead of meta-oe?

FWIW, libraw1394 is the libusb for firewire, so it's not multimedia related, the other recipes like coriander and mikmod are. I'm not sure I'd put opencv in the multimedia category, though.

Right, agreed. So of this patchset coriander should probably go into meta- multimedia. There are other multimedia recipes in meta-oe that ought to be moved there, so we could leave moving libmikmod until those are moved.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre