[meta-multimedia][PATCH 0/4] vlc: B!=S and pkg-config friendly

[meta-multimedia][PATCH 0/4] vlc: B!=S and pkg-config friendly

[Tim Orling]

* Cleanup do_configure, upstream is more autoreconf friendly
* Inherit pkgconfig, upstream is more pkg-config friendly
* Remove EXTRA_OECONF --enable-live555, add PACKAGE_CONFIGURE ?= "live555"

Tim Orling (4):
  vlc.inc: cleanup configure, inherit pkgconfig
  vlc: use AM_PATH_LIBGCRYPT instead of libgcrypt-config
  vlc: modules/gui/qt4/Modules.am not B!=S friendly
  vlc: add patches to fix B!=S and pkg-config

 meta-multimedia/recipes-multimedia/vlc/vlc.inc     | 33 +++++++---------
 .../vlc/vlc/0003-use-am-path-libgcrypt.patch       | 46 ++++++++++++++++++++++
 .../0004-modules-gui-qt4-out-of-tree-build.patch   | 17 ++++++++
 .../recipes-multimedia/vlc/vlc_2.1.4.bb            |  2 +
 4 files changed, 80 insertions(+), 18 deletions(-)
 create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch
 create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch

-- 
1.9.3

[meta-multimedia][PATCH 1/4] vlc.inc: cleanup configure, inherit pkgconfig

[Tim Orling]

* Upstream is now much more pkg-config friendly
* Clean up configure baggage, no longer needed

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 33 ++++++++++++--------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 58f5648..c188771 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -5,17 +5,17 @@ SECTION = "multimedia"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl \
-   libsdl-image qt4-x11-free dbus dbus-glib libxml2 gnutls tremor \
-   faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib libdvdcss \
-   libdvdread lua-native lua libidn libnotify gtk+ gnome-vfs libdc1394 \
-   libraw1394 avahi libjpeg-turbo xz libmodplug mpeg2dec \
+DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native gst-plugins-bad \
+   virtual/libsdl libsdl-image qt4-x11-free dbus dbus-glib libxml2 gnutls \
+   tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \
+   libdvdcss libdvdread lua-native lua libidn libnotify gtk+ gnome-vfs \
+   libdc1394 libraw1394 avahi libjpeg-turbo xz libmodplug mpeg2dec \
    libmtp opencv libopus orc libusb1 schroedinger taglib \
    tiff xcb-util-keysyms samba"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz"
 
-inherit autotools gettext
+inherit autotools gettext pkgconfig
 
 ARM_INSTRUCTION_SET = "arm"
 
@@ -29,18 +29,20 @@ EXTRA_OECONF = "\
     --enable-freetype \
     --enable-sdl \ 
     --enable-png \
-    --enable-live555 --enable-tremor \
+    --enable-tremor \
     --enable-v4l2 --disable-aa --disable-faad \
     --enable-dbus \
     --without-contrib \
     --without-kde-solid \
     --disable-glx \
     --enable-realrtsp \
+    --disable-libtar \
     ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
     ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
 "
 
+PACKAGECONFIG ?= " live555"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
@@ -48,18 +50,13 @@ PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
 PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass"
 PACKAGECONFIG[mkv] = "--enable-mkv,--disable-mkv,libmatroska libebml"
 
-do_configure() {
-    cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ 
-    ./bootstrap    
-    gnu-configize --force
-    libtoolize --force
-    #autoreconf --force -i
+do_configure_prepend() {
     cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
-    oe_runconf
-    rm config.log
-    #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g ${S}/vlc-config
-    sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
-    sed -i -e s:'${top_builddir_slash}libtool':${TARGET_SYS}-libtool:g ${S}/doltlibtool
+}
+
+do_configure_append() {
+    sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${B}/include\ -DSYS_LINUX:g ${B}/modules/gui/qt4/Makefile
+    sed -i -e s:'${top_builddir_slash}libtool':${TARGET_SYS}-libtool:g ${B}/doltlibtool
 }
 
 # This recipe packages vlc as a library as well, so qt4 dependencies
-- 
1.9.3

[meta-multimedia][PATCH 2/4] vlc: use AM_PATH_LIBGCRYPT instead of libgcrypt-config

[Tim Orling]

* AM_PATH_LIBGCRYPT exists for a reason, why not use it?

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
 .../vlc/vlc/0003-use-am-path-libgcrypt.patch       | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch
new file mode 100644
index 0000000..ae80745
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch
@@ -0,0 +1,46 @@
+* The upstream tests for libgcrypt are awkward and not working.
+  - Requires libgcrypt-config, which seems broken?
+* AM_PATH_LIBGCRYPT exists for a reason, why not use it? KISS.
+* Upstream abandoned AM_PATH_LIBGCRYPT in the past...newer automake ok?
+
+Upstream status: Pending
+
+Index: vlc-2.1.4/configure.ac
+===================================================================
+--- vlc-2.1.4.orig/configure.ac
++++ vlc-2.1.4/configure.ac
+@@ -3940,25 +3940,19 @@ PKG_ENABLE_MODULES_VLC([LIBXML2], [xml],
+ dnl
+ dnl libgcrypt
+ dnl
++GCRYPT_LIBVER=1
++GCRYPT_REQ=1.1.94
+ AC_ARG_ENABLE(libgcrypt,
+   [  --disable-libgcrypt     gcrypt support (default enabled)])
+ AS_IF([test "${enable_libgcrypt}" != "no"], [
+-  AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
+-    libgcrypt-config --version >/dev/null || \
+-        AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found])
+-    AC_CHECK_LIB(gcrypt, gcry_control, [
+-      have_libgcrypt="yes"
+-      GCRYPT_CFLAGS="`libgcrypt-config --cflags`"
+-      GCRYPT_LIBS="`libgcrypt-config --libs`"
+-    ], [
+-      AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.])
+-    ], [`libgcrypt-config --libs`])
+-  ], [
+-    AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.])
+-  ], [#include <gcrypt.h>]
+-  )
++      AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_REQ,
++      [
++          GCRYPT_CFLAGS="$LIBGCRYPT_CFLAGS"
++          GCRYPT_LIBS="$LIBGCRYPT_LIBS"
++      ],[
++          AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.])
++      ])
+ ])
+-
+ AC_SUBST(GCRYPT_CFLAGS)
+ AC_SUBST(GCRYPT_LIBS)
+ AM_CONDITIONAL([HAVE_GCRYPT], [test "${have_libgcrypt}" = "yes"])
-- 
1.9.3

[meta-multimedia][PATCH 3/4] vlc: modules/gui/qt4/Modules.am not B!=S friendly

[Tim Orling]

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
 .../vlc/0004-modules-gui-qt4-out-of-tree-build.patch    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch
new file mode 100644
index 0000000..3dadb23
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch
@@ -0,0 +1,17 @@
+* modules/gui/qt4/Modules.am not B!=S friendly
+* Simple solution to missing directories in ${B}
+
+Upstream status: Pending
+
+Index: vlc-2.1.4/modules/gui/qt4/Modules.am
+===================================================================
+--- vlc-2.1.4.orig/modules/gui/qt4/Modules.am
++++ vlc-2.1.4/modules/gui/qt4/Modules.am
+@@ -261,6 +261,7 @@ else
+ if HAVE_WIN32
+ 	$(moc_verbose)$(MOC) -D_WIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
+ else
++	[ -d $(dir $@) ] || mkdir -p $(dir $@)
+ 	$(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
+ endif
+ endif
-- 
1.9.3

[meta-multimedia][PATCH 4/4] vlc: add patches to fix B!=S and pkg-config

[Tim Orling]

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
index 46a2712..f9be48d 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
@@ -5,6 +5,8 @@ EXTRA_OECONF += " --enable-libxml2=no"
 
 SRC_URI += "file://0001-enable-subdir-objects.patch \
             file://0002-glibc-does-not-provide-strlcpy.patch \
+            file://0003-use-am-path-libgcrypt.patch \
+            file://0004-modules-gui-qt4-out-of-tree-build.patch \
 "
 
 SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222"
-- 
1.9.3

Re: [meta-multimedia][PATCH 4/4] vlc: add patches to fix B!=S and pkg-config

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]

On Sat, Jul 19, 2014 at 09:07:40PM -0700, Tim Orling wrote:
> Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> ---
>  meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
> index 46a2712..f9be48d 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
> @@ -5,6 +5,8 @@ EXTRA_OECONF += " --enable-libxml2=no"
>  
>  SRC_URI += "file://0001-enable-subdir-objects.patch \
>              file://0002-glibc-does-not-provide-strlcpy.patch \
> +            file://0003-use-am-path-libgcrypt.patch \
> +            file://0004-modules-gui-qt4-out-of-tree-build.patch \
>  "

Please add this together with .patch file itself.

>  SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222"
> -- 
> 1.9.3
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-multimedia][PATCH 4/4] vlc: add patches to fix B!=S and pkg-config

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]

On Sun, Jul 20, 2014 at 10:19:31AM +0200, Martin Jansa wrote:
> On Sat, Jul 19, 2014 at 09:07:40PM -0700, Tim Orling wrote:
> > Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> > ---
> >  meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
> > index 46a2712..f9be48d 100644
> > --- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
> > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
> > @@ -5,6 +5,8 @@ EXTRA_OECONF += " --enable-libxml2=no"
> >  
> >  SRC_URI += "file://0001-enable-subdir-objects.patch \
> >              file://0002-glibc-does-not-provide-strlcpy.patch \
> > +            file://0003-use-am-path-libgcrypt.patch \
> > +            file://0004-modules-gui-qt4-out-of-tree-build.patch \
> >  "
> 
> Please add this together with .patch file itself.

nvm, I did that when cherry-picking to master-next

> 
> >  SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222"
> > -- 
> > 1.9.3
> > 
> > -- 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-multimedia][PATCH 4/4] vlc: add patches to fix B!=S and pkg-config

[Tim Orling]

On Sun, Jul 20, 2014 at 2:49 AM, Martin Jansa <martin.jansa@gmail.com>
wrote:

> On Sun, Jul 20, 2014 at 10:19:31AM +0200, Martin Jansa wrote:
> > On Sat, Jul 19, 2014 at 09:07:40PM -0700, Tim Orling wrote:
> > > Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> > > ---
> > >  meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb | 2 ++
> > >  1 file changed, 2 insertions(+)
> > >
> > > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
> b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
> > > index 46a2712..f9be48d 100644
> > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
> > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
> > > @@ -5,6 +5,8 @@ EXTRA_OECONF += " --enable-libxml2=no"
> > >
> > >  SRC_URI += "file://0001-enable-subdir-objects.patch \
> > >              file://0002-glibc-does-not-provide-strlcpy.patch \
> > > +            file://0003-use-am-path-libgcrypt.patch \
> > > +            file://0004-modules-gui-qt4-out-of-tree-build.patch \
> > >  "
> >
> > Please add this together with .patch file itself.
>
> nvm, I did that when cherry-picking to master-next
>
>
Much cleaner. Thank you, Martin.


> >
> > >  SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222"
> > > --
> > > 1.9.3
> > >
> > > --
> > > _______________________________________________
> > > Openembedded-devel mailing list
> > > Openembedded-devel@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> > --
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
>
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>

Re: [meta-multimedia][PATCH 1/4] vlc.inc: cleanup configure, inherit pkgconfig

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 4339 bytes --]

On Sat, Jul 19, 2014 at 09:07:37PM -0700, Tim Orling wrote:
> * Upstream is now much more pkg-config friendly
> * Clean up configure baggage, no longer needed
> 
> Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> ---
>  meta-multimedia/recipes-multimedia/vlc/vlc.inc | 33 ++++++++++++--------------
>  1 file changed, 15 insertions(+), 18 deletions(-)
> 
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> index 58f5648..c188771 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> @@ -5,17 +5,17 @@ SECTION = "multimedia"
>  LICENSE = "GPL-2.0"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>  

Can you please try it with standalone libpostproc (and libav-9*), now
when libpostproc build was fixed it has floating dependency on it:
vlc rdepends on libpostproc but its not a build dependency? [build-deps]

thanks

> -DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl \
> -   libsdl-image qt4-x11-free dbus dbus-glib libxml2 gnutls tremor \
> -   faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib libdvdcss \
> -   libdvdread lua-native lua libidn libnotify gtk+ gnome-vfs libdc1394 \
> -   libraw1394 avahi libjpeg-turbo xz libmodplug mpeg2dec \
> +DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native gst-plugins-bad \
> +   virtual/libsdl libsdl-image qt4-x11-free dbus dbus-glib libxml2 gnutls \
> +   tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \
> +   libdvdcss libdvdread lua-native lua libidn libnotify gtk+ gnome-vfs \
> +   libdc1394 libraw1394 avahi libjpeg-turbo xz libmodplug mpeg2dec \
>     libmtp opencv libopus orc libusb1 schroedinger taglib \
>     tiff xcb-util-keysyms samba"
>  
>  SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz"
>  
> -inherit autotools gettext
> +inherit autotools gettext pkgconfig
>  
>  ARM_INSTRUCTION_SET = "arm"
>  
> @@ -29,18 +29,20 @@ EXTRA_OECONF = "\
>      --enable-freetype \
>      --enable-sdl \ 
>      --enable-png \
> -    --enable-live555 --enable-tremor \
> +    --enable-tremor \
>      --enable-v4l2 --disable-aa --disable-faad \
>      --enable-dbus \
>      --without-contrib \
>      --without-kde-solid \
>      --disable-glx \
>      --enable-realrtsp \
> +    --disable-libtar \
>      ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
>      ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
>      ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
>  "
>  
> +PACKAGECONFIG ?= " live555"
>  PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
>  PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
>  PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> @@ -48,18 +50,13 @@ PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
>  PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass"
>  PACKAGECONFIG[mkv] = "--enable-mkv,--disable-mkv,libmatroska libebml"
>  
> -do_configure() {
> -    cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ 
> -    ./bootstrap    
> -    gnu-configize --force
> -    libtoolize --force
> -    #autoreconf --force -i
> +do_configure_prepend() {
>      cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> -    oe_runconf
> -    rm config.log
> -    #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g ${S}/vlc-config
> -    sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
> -    sed -i -e s:'${top_builddir_slash}libtool':${TARGET_SYS}-libtool:g ${S}/doltlibtool
> +}
> +
> +do_configure_append() {
> +    sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${B}/include\ -DSYS_LINUX:g ${B}/modules/gui/qt4/Makefile
> +    sed -i -e s:'${top_builddir_slash}libtool':${TARGET_SYS}-libtool:g ${B}/doltlibtool
>  }
>  
>  # This recipe packages vlc as a library as well, so qt4 dependencies
> -- 
> 1.9.3
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]