From 8353bbe2df4d2be67fd97976ec37a0a5e48e9ae2 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 19 May 2006 15:24:25 +0000 Subject: pvrusb2-mci: added 20060517 snapshot --- .../pvrusb2-mci-20060517/.mtn2git_empty | 0 .../pvrusb2-mci-20060517/Makefile.patch | 25 ++++++++++++++++ packages/pvrusb2-mci/pvrusb2-mci_20060517.bb | 35 ++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060517/.mtn2git_empty create mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060517/Makefile.patch create mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060517.bb (limited to 'packages') diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060517/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060517/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060517/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060517/Makefile.patch new file mode 100644 index 0000000000..3db0b2c9d6 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20060517/Makefile.patch @@ -0,0 +1,25 @@ +*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 +--- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 +*************** +*** 57,66 **** + CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install + + else + +--- 57,66 ---- + CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install + + else + diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb new file mode 100644 index 0000000000..9df16b04eb --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +HOMEPAGE = "http://www.isely.net/pvrusb2.html" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "eFfeM " +LICENSE = "GPL" +PR = "r0" +RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-I${KERNEL_SOURCE}/drivers/media/video' " + +CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " + +CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " + +EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ + -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} -- cgit v1.2.3 From 25f4dd6a42293e3e7c2644d53d22d3a049975dc6 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 19 May 2006 19:34:16 +0000 Subject: packages/libxine: Do not search for aalib-test Do not search for aalib test tool. In the worst case you add -I/usr/include to the compiler line. For our targets we do not want aalib anyway... --- packages/libxine/libxine-fb_1.0.bb | 2 +- packages/libxine/libxine_1.1.0.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb index 62f1ac393e..fd9baee512 100644 --- a/packages/libxine/libxine-fb_1.0.bb +++ b/packages/libxine/libxine-fb_1.0.bb @@ -34,7 +34,7 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ --enable-shared --disable-static \ --disable-fb --disable-alsa --disable-vcd \ --disable-asf --disable-faad --disable-iconv \ - --disable-aalib \ + --disable-aalib --disable-aalibtest \ --without-v4l --without-arts --without-sdl \ --disable-dxr3 --without-xv --without-xvmc \ --without-xxmc --without-Xshm --without-x " diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index 824c381a92..cd2a628f3b 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -39,6 +39,7 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ --disable-asf --disable-faad --disable-iconv \ --without-v4l --without-arts --without-sdl \ --without-xv --without-xxmc --without-xvmc \ + --disable-aalibtest \ --with-x --x-includes=${STAGING_INCDIR}/X11 --x-libraries=${STAGING_LIBDIR}" export WAND_CONFIG="${STAGING_BINDIR}/Wand-config" -- cgit v1.2.3 From cb5660d3a28e9d8e0b67866781f78f250c371994 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 19 May 2006 20:31:50 +0000 Subject: packages/libcroco: Fix generation of libcroco*.pc to not include /usr/include Change autofoo to not put /usr/include into the CFlags, same applies to the library flags. GNU master phil crafted this patch - which I'm not able to understand... --- packages/libcroco/files/.mtn2git_empty | 0 packages/libcroco/files/croco.patch | 13 +++++++++++++ packages/libcroco/libcroco_0.6.0.bb | 2 ++ packages/libcroco/libcroco_0.6.1.bb | 2 ++ 4 files changed, 17 insertions(+) create mode 100644 packages/libcroco/files/.mtn2git_empty create mode 100644 packages/libcroco/files/croco.patch (limited to 'packages') diff --git a/packages/libcroco/files/.mtn2git_empty b/packages/libcroco/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libcroco/files/croco.patch b/packages/libcroco/files/croco.patch new file mode 100644 index 0000000000..572f9de59f --- /dev/null +++ b/packages/libcroco/files/croco.patch @@ -0,0 +1,13 @@ +--- opie/configure.in.old 2006-05-19 20:57:30.000000000 +0100 ++++ opie/configure.in 2006-05-19 20:57:56.000000000 +0100 +@@ -131,8 +131,8 @@ + dnl Define the CROCO_LIBS and CROCO_CFLAGS variables. These will be used + dnl by client application to know where to find croco include files and libs. + dnl +-CROCO_LIBS="-L${libdir} -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION" +-CROCO_CFLAGS="-I${includedir}/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION" ++CROCO_LIBS='-L${libdir}'" -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION" ++CROCO_CFLAGS='-I${includedir}'"/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION" + + AC_SUBST(LIBXML2_LIBS) + AC_SUBST(LIBXML2_CFLAGS) diff --git a/packages/libcroco/libcroco_0.6.0.bb b/packages/libcroco/libcroco_0.6.0.bb index bbed9e4fb3..ead05af413 100644 --- a/packages/libcroco/libcroco_0.6.0.bb +++ b/packages/libcroco/libcroco_0.6.0.bb @@ -7,6 +7,8 @@ PR = "r1" inherit autotools pkgconfig gnome +SRC_URI_append = " file://croco.patch;patch=1 " + do_stage() { install -d ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/libcroco diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb index d92987adf3..99bd631913 100644 --- a/packages/libcroco/libcroco_0.6.1.bb +++ b/packages/libcroco/libcroco_0.6.1.bb @@ -7,6 +7,8 @@ PR = "r1" inherit autotools pkgconfig gnome +SRC_URI_append = " file://croco.patch;patch=1 " + do_stage() { install -d ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/libcroco -- cgit v1.2.3