From 0851c77c5104ab3e1e62520ca0b7f1fb9e7132bd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Oct 2011 20:54:12 +0200 Subject: misc fixes from bulk build --- package/keyutils/patches/patch-Makefile | 31 ++++++-- package/lm_sensors/Makefile | 14 +--- package/moc/Makefile | 5 +- package/sane-backends/Makefile | 8 +- package/sane-backends/patches/patch-Makefile_in | 6 +- .../sane-backends/patches/patch-backend_microtek_c | 6 +- .../patches/patch-backend_pixma_bjnp_c | 6 +- .../patches/patch-backend_pixma_imageclass_c | 6 +- .../patches/patch-backend_sm3600-scanutil_c | 6 +- package/sane-backends/patches/patch-configure | 89 ++++++++++++++++++++-- package/sane-backends/patches/patch-configure_in | 10 +-- package/sane-backends/patches/patch-ltmain_sh | 11 --- package/v4l-utils/patches/patch-utils_Makefile | 8 ++ package/xawtv/Makefile | 5 ++ package/xawtv/patches/patch-Makefile | 7 +- package/xawtv/patches/patch-Makefile.orig | 10 --- package/xawtv/patches/patch-console_fbtools_c | 10 +++ package/xawtv/patches/patch-console_record_c | 11 +++ package/xawtv/patches/patch-x11_rootv_c | 20 +++++ package/xfsprogs/Makefile | 2 + target/arm/kernel.config.sharp-zaurus | 13 ++-- target/linux/config/Config.in.misc | 1 + target/linux/config/Config.in.multimedia | 1 + 23 files changed, 206 insertions(+), 80 deletions(-) delete mode 100644 package/sane-backends/patches/patch-ltmain_sh create mode 100644 package/v4l-utils/patches/patch-utils_Makefile delete mode 100644 package/xawtv/patches/patch-Makefile.orig create mode 100644 package/xawtv/patches/patch-console_fbtools_c create mode 100644 package/xawtv/patches/patch-console_record_c create mode 100644 package/xawtv/patches/patch-x11_rootv_c diff --git a/package/keyutils/patches/patch-Makefile b/package/keyutils/patches/patch-Makefile index c541f727c..1b44e0730 100644 --- a/package/keyutils/patches/patch-Makefile +++ b/package/keyutils/patches/patch-Makefile @@ -1,5 +1,5 @@ --- keyutils-1.5.3.orig/Makefile 2011-08-11 15:24:09.000000000 +0200 -+++ keyutils-1.5.3/Makefile 2011-09-19 21:52:31.000000000 +0200 ++++ keyutils-1.5.3/Makefile 2011-09-26 03:06:03.669381901 +0200 @@ -1,5 +1,5 @@ CPPFLAGS := -I. -CFLAGS := $(CPPFLAGS) -g -Wall -Werror @@ -7,16 +7,33 @@ INSTALL := install DESTDIR := SPECFILE := keyutils.spec -@@ -49,7 +49,7 @@ LIBNAME := libkeyutils.so.$(APIVERSION) +@@ -49,24 +49,11 @@ LIBNAME := libkeyutils.so.$(APIVERSION) # Guess at the appropriate lib directory and word size # ############################################################################### -LIBDIR := $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!') +LIBDIR := /usr/lib USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) - BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit +-BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit -@@ -84,7 +84,7 @@ endif + LNS := ln -sf + +-ifeq ($(BUILDFOR),32-bit) +-CFLAGS += -m32 +-LIBDIR := /lib +-USRLIBDIR := /usr/lib +-else +-ifeq ($(BUILDFOR),64-bit) +-CFLAGS += -m64 +-LIBDIR := /lib64 +-USRLIBDIR := /usr/lib64 +-endif +-endif +- + ############################################################################### + # + # This is necessary if glibc doesn't know about the key management error codes +@@ -84,7 +71,7 @@ endif # Normal build rule # ############################################################################### @@ -25,7 +42,7 @@ ############################################################################### # -@@ -125,13 +125,13 @@ keyutils.os: keyutils.c keyutils.h Makef +@@ -125,13 +112,13 @@ keyutils.os: keyutils.c keyutils.h Makef %.o: %.c keyutils.h Makefile $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< @@ -42,7 +59,7 @@ $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv ############################################################################### -@@ -139,6 +139,13 @@ key.dns_resolver: key.dns_resolver.o -lk +@@ -139,6 +126,13 @@ key.dns_resolver: key.dns_resolver.o -lk # Install everything # ############################################################################### @@ -56,7 +73,7 @@ install: all ifeq ($(NO_ARLIB),0) $(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB) -@@ -205,7 +212,7 @@ distclean: clean +@@ -205,7 +199,7 @@ distclean: clean TARBALL := keyutils-$(VERSION).tar.bz2 SRCBALL := rpmbuild/SOURCES/$(TARBALL) diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile index 6d37129e7..0f6ba7130 100644 --- a/package/lm_sensors/Makefile +++ b/package/lm_sensors/Makefile @@ -8,10 +8,11 @@ PKG_VERSION:= 3.3.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 8c0eebda8524fc87da1393b4564d279b PKG_DESCR:= linux hw sensor toolset -PKG_DEPENDS:= sysfsutils PKG_SECTION:= misc +PKG_DEPENDS:= sysfsutils PKG_URL:= http://www.lm-sensors.org PKG_SITES:= http://dl.lm-sensors.org/lm-sensors/releases/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 PKG_ARCH_DEPENDS:= x86 x86_64 @@ -32,16 +33,9 @@ $(eval $(call PKG_template,LM_SENSORS_DEV,lm-sensors-dev,${PKG_VERSION}-${PKG_RE $(eval $(call PKG_template,LM_SENSORS_DETECT,lm-sensors-detect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LM_SENSORS_DETECT},${PKGSC_LM_SENSORS_DETECT})) CONFIG_STYLE:= manual +ALL_TARGET:= user +TARGET_LDFLAGS+= -liconv -do-build: - ${MAKE} -C ${WRKBUILD} \ - ${TARGET_CONFIGURE_OPTS} \ - MACHINE="${CPU_ARCH}" \ - LINUX="${LINUX_DIR}" \ - STAGING_DIR="${STAGING_DIR}" \ - PREFIX="/usr" \ - user - lm-sensors-install: ${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/sensors ${IDIR_LM_SENSORS}/usr/bin/sensors diff --git a/package/moc/Makefile b/package/moc/Makefile index 45c41f3d8..2ce5d2072 100644 --- a/package/moc/Makefile +++ b/package/moc/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 2dd0cb6481d77fda09c58ec3154a21c0 PKG_DESCR:= console music player PKG_SECTION:= multimedia -PKG_DEPENDS:= libmad libvorbis libcurl libflac libffmpeg libiconv +PKG_DEPENDS:= libmad libvorbis libcurl libflac libiconv PKG_DEPENDS+= libncurses libid3tag -PKG_BUILDDEP:= ncurses libvorbis curl libmad flac ffmpeg libiconv +PKG_BUILDDEP:= ncurses libvorbis curl libmad flac libiconv PKG_BUILDDEP+= libid3tag PKG_URL:= http://moc.daper.net/ PKG_SITES:= ftp://ftp.daper.net/pub/soft/moc/unstable/ @@ -26,6 +26,7 @@ CONFIGURE_ARGS+= --without-jack \ --without-oss \ --without-musepack \ --without-speex \ + --without-ffmpeg \ --without-sndfile post-install: diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index e575f7ac0..ce8b7fe53 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= sane-backends -PKG_VERSION:= 1.0.20 +PKG_VERSION:= 1.0.22 PKG_RELEASE:= 1 -PKG_MD5SUM:= a0cfdfdebca2feb4f2ba5d3418b15a42 +PKG_MD5SUM:= fadf56a60f4776bfb24491f66b617cf5 PKG_DESCR:= Scanner access now easy PKG_SECTION:= misc PKG_DEPENDS:= libpthread @@ -82,7 +82,6 @@ $(eval $(call PKG_template,SANE_BACKEND_MATSUSHITA,sane-backend-matsushita,${PKG $(eval $(call PKG_template,SANE_BACKEND_MICROTEK2,sane-backend-microtek2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SANE_BACKEND_MICROTEK,sane-backend-microtek,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SANE_BACKEND_MUSTEK,sane-backend-mustek,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB2,sane-backend-mustek-usb2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB,sane-backend-mustek-usb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SANE_BACKEND_NEC,sane-backend-nec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SANE_BACKEND_NIASH,sane-backend-niash,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -141,7 +140,6 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_MATSUSHITA,matsushita)) $(eval $(call PKG_mod_template,SANE_BACKEND_MICROTEK2,microtek2)) $(eval $(call PKG_mod_template,SANE_BACKEND_MICROTEK,microtek)) $(eval $(call PKG_mod_template,SANE_BACKEND_MUSTEK,mustek)) -$(eval $(call PKG_mod_template,SANE_BACKEND_MUSTEK_USB2,mustek_usb2,n)) $(eval $(call PKG_mod_template,SANE_BACKEND_MUSTEK_USB,mustek_usb)) $(eval $(call PKG_mod_template,SANE_BACKEND_NEC,nec)) $(eval $(call PKG_mod_template,SANE_BACKEND_NIASH,niash,n)) @@ -169,7 +167,7 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX1220U,umax1220u)) $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX_PP,umax_pp)) $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX,umax)) -CONFIGURE_ENV+= ac_cv_func_ioperm=no +CONFIGURE_ENV+= ac_cv_func_ioperm=no have_libv4l1=no CONFIGURE_ARGS+= --disable-translations \ --without-gphoto2 \ --enable-libusb diff --git a/package/sane-backends/patches/patch-Makefile_in b/package/sane-backends/patches/patch-Makefile_in index 6a143eb05..b1796c56f 100644 --- a/package/sane-backends/patches/patch-Makefile_in +++ b/package/sane-backends/patches/patch-Makefile_in @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.20.orig/Makefile.in 2009-04-30 15:41:20.000000000 +0200 -+++ sane-backends-1.0.20/Makefile.in 2009-05-11 00:17:44.000000000 +0200 -@@ -244,7 +244,7 @@ target_alias = @target_alias@ +--- sane-backends-1.0.22.orig/Makefile.in 2011-01-30 19:50:56.000000000 +0100 ++++ sane-backends-1.0.22/Makefile.in 2011-10-01 19:26:02.309066938 +0200 +@@ -293,7 +293,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/package/sane-backends/patches/patch-backend_microtek_c b/package/sane-backends/patches/patch-backend_microtek_c index 6d99f5808..dde369f2d 100644 --- a/package/sane-backends/patches/patch-backend_microtek_c +++ b/package/sane-backends/patches/patch-backend_microtek_c @@ -1,9 +1,9 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.20.orig/backend/microtek.c 2009-02-26 17:11:17.000000000 +0100 -+++ sane-backends-1.0.20/backend/microtek.c 2009-05-11 00:10:23.000000000 +0200 +--- sane-backends-1.0.22.orig/backend/microtek.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/microtek.c 2011-10-01 19:26:01.659066938 +0200 @@ -59,6 +59,7 @@ - #include "sane/config.h" + #include "../include/sane/config.h" +#include #include diff --git a/package/sane-backends/patches/patch-backend_pixma_bjnp_c b/package/sane-backends/patches/patch-backend_pixma_bjnp_c index 4b3224eb9..5d347c00e 100644 --- a/package/sane-backends/patches/patch-backend_pixma_bjnp_c +++ b/package/sane-backends/patches/patch-backend_pixma_bjnp_c @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.20.orig/backend/pixma_bjnp.c 2009-04-01 18:26:58.000000000 +0200 -+++ sane-backends-1.0.20/backend/pixma_bjnp.c 2009-05-11 00:23:33.000000000 +0200 +--- sane-backends-1.0.22.orig/backend/pixma_bjnp.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/pixma_bjnp.c 2011-10-01 19:26:01.699066938 +0200 @@ -59,9 +59,6 @@ #ifdef HAVE_SYS_TYPES_H #include @@ -11,7 +11,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* * networking stuff -@@ -196,7 +193,7 @@ truncate_hostname (char *hostname, char +@@ -196,7 +193,7 @@ truncate_hostname (char *hostname, char { /* this is a hostname, not an ip-address, so remove domain part of the name */ diff --git a/package/sane-backends/patches/patch-backend_pixma_imageclass_c b/package/sane-backends/patches/patch-backend_pixma_imageclass_c index 7c2492c5f..cb265aedb 100644 --- a/package/sane-backends/patches/patch-backend_pixma_imageclass_c +++ b/package/sane-backends/patches/patch-backend_pixma_imageclass_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.20.orig/backend/pixma_imageclass.c 2009-03-12 18:36:09.000000000 +0100 -+++ sane-backends-1.0.20/backend/pixma_imageclass.c 2009-05-11 00:30:36.000000000 +0200 -@@ -159,8 +159,6 @@ query_status (pixma_t * s) +--- sane-backends-1.0.22.orig/backend/pixma_imageclass.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/pixma_imageclass.c 2011-10-01 19:26:01.779066938 +0200 +@@ -161,8 +161,6 @@ query_status (pixma_t * s) if (error >= 0) { memcpy (mf->current_status, data, 12); diff --git a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c b/package/sane-backends/patches/patch-backend_sm3600-scanutil_c index 542afb9c1..436102a18 100644 --- a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c +++ b/package/sane-backends/patches/patch-backend_sm3600-scanutil_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.20.orig/backend/sm3600-scanutil.c 2005-08-16 21:50:34.000000000 +0200 -+++ sane-backends-1.0.20/backend/sm3600-scanutil.c 2009-05-11 21:08:46.000000000 +0200 -@@ -47,6 +47,7 @@ $Id: sm3600-scanutil.c,v 1.12 2005-08-16 +--- sane-backends-1.0.22.orig/backend/sm3600-scanutil.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/sm3600-scanutil.c 2011-10-01 19:26:01.819066938 +0200 +@@ -47,6 +47,7 @@ $Id$ ====================================================================== */ diff --git a/package/sane-backends/patches/patch-configure b/package/sane-backends/patches/patch-configure index 927e3a8ab..d8d5aca8d 100644 --- a/package/sane-backends/patches/patch-configure +++ b/package/sane-backends/patches/patch-configure @@ -1,11 +1,90 @@ ---- sane-backends-1.0.20.orig/configure 2009-05-03 18:59:22.000000000 +0200 -+++ sane-backends-1.0.20/configure 2010-01-14 19:51:31.000000000 +0100 -@@ -34117,7 +34117,7 @@ ALL_BACKENDS="abaton agfafocus apple art - hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \ +--- sane-backends-1.0.22.orig/configure 2011-02-14 02:27:52.000000000 +0100 ++++ sane-backends-1.0.22/configure 2011-10-01 19:32:51.919066675 +0200 +@@ -7529,77 +7529,7 @@ done + + + +- +- +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L" >&5 +-$as_echo_n "checking for LIBV4L... " >&6; } +- +-if test -n "$LIBV4L_CFLAGS"; then +- pkg_cv_LIBV4L_CFLAGS="$LIBV4L_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_LIBV4L_CFLAGS=`$PKG_CONFIG --cflags "libv4l1" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$LIBV4L_LIBS"; then +- pkg_cv_LIBV4L_LIBS="$LIBV4L_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_LIBV4L_LIBS=`$PKG_CONFIG --libs "libv4l1" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libv4l1" 2>&1` +- else +- LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors "libv4l1" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$LIBV4L_PKG_ERRORS" >&5 +- +- have_libv4l1=no +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- have_libv4l1=no +-else +- LIBV4L_CFLAGS=$pkg_cv_LIBV4L_CFLAGS +- LIBV4L_LIBS=$pkg_cv_LIBV4L_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- have_libv4l1=yes +-fi ++have_libv4l1=no + + + +@@ -16874,7 +16804,7 @@ ALL_BACKENDS="abaton agfafocus apple art + leo lexmark ma1509 magicolor \ matsushita microtek microtek2 mustek mustek_pp \ mustek_usb mustek_usb2 nec net niash pie pint \ - pixma plustek plustek_pp qcam ricoh rts8891 s9036 \ + pixma plustek plustek_pp ricoh rts8891 s9036 \ sceptre sharp sm3600 sm3840 snapscan sp15c st400 \ stv680 tamarack teco1 teco2 teco3 test u12 umax - umax_pp umax1220u v4l xerox_mfp" + umax_pp umax1220u v4l xerox_mfp p5" diff --git a/package/sane-backends/patches/patch-configure_in b/package/sane-backends/patches/patch-configure_in index 48e14d989..fbc410c70 100644 --- a/package/sane-backends/patches/patch-configure_in +++ b/package/sane-backends/patches/patch-configure_in @@ -1,11 +1,11 @@ ---- sane-backends-1.0.20.orig/configure.in 2009-05-03 03:25:23.000000000 +0200 -+++ sane-backends-1.0.20/configure.in 2009-06-19 23:27:39.000000000 +0200 -@@ -513,7 +513,7 @@ ALL_BACKENDS="abaton agfafocus apple art - hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \ +--- sane-backends-1.0.22.orig/configure.in 2011-02-14 00:27:15.000000000 +0100 ++++ sane-backends-1.0.22/configure.in 2011-10-01 19:26:02.249066938 +0200 +@@ -559,7 +559,7 @@ ALL_BACKENDS="abaton agfafocus apple art + leo lexmark ma1509 magicolor \ matsushita microtek microtek2 mustek mustek_pp \ mustek_usb mustek_usb2 nec net niash pie pint \ - pixma plustek plustek_pp qcam ricoh rts8891 s9036 \ + pixma plustek plustek_pp ricoh rts8891 s9036 \ sceptre sharp sm3600 sm3840 snapscan sp15c st400 \ stv680 tamarack teco1 teco2 teco3 test u12 umax - umax_pp umax1220u v4l xerox_mfp" + umax_pp umax1220u v4l xerox_mfp p5" diff --git a/package/sane-backends/patches/patch-ltmain_sh b/package/sane-backends/patches/patch-ltmain_sh deleted file mode 100644 index 46c089aa5..000000000 --- a/package/sane-backends/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- sane-backends-1.0.20.orig/ltmain.sh 2009-02-10 22:41:47.000000000 +0100 -+++ sane-backends-1.0.20/ltmain.sh 2011-01-17 11:25:40.000000000 +0100 -@@ -1680,7 +1680,7 @@ EOF - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. diff --git a/package/v4l-utils/patches/patch-utils_Makefile b/package/v4l-utils/patches/patch-utils_Makefile new file mode 100644 index 000000000..daf4c67e9 --- /dev/null +++ b/package/v4l-utils/patches/patch-utils_Makefile @@ -0,0 +1,8 @@ +--- v4l-utils-0.8.5.orig/utils/Makefile 2011-07-17 18:06:39.000000000 +0200 ++++ v4l-utils-0.8.5/utils/Makefile 2011-09-26 04:56:47.369377637 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS=libv4l2util libmedia_dev decode_tm6000 keytable rds v4l2-compliance v4l2-ctl v4l2-dbg v4l2-sysfs-path xc3028-firmware ++SUBDIRS=libv4l2util libmedia_dev v4l2-compliance v4l2-ctl v4l2-dbg + + all install: + @for i in $(SUBDIRS); do \ diff --git a/package/xawtv/Makefile b/package/xawtv/Makefile index 238f3bd4b..f4c4ac60a 100644 --- a/package/xawtv/Makefile +++ b/package/xawtv/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= libxinerama libv4l PKG_SECTION:= x11/apps PKG_SITES:= http://linuxtv.org/downloads/xawtv/ +PKG_ARCH_DEPENDS:= x86 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk @@ -21,6 +23,9 @@ $(eval $(call PKG_template,XAWTV,xawtv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN CONFIG_STYLE:= manual +pre-configure: + $(SED) "s#@@GNU_TARGET_NAME@@#${GNU_TARGET_NAME}#" $(WRKBUILD)/Makefile + xawtv-install: $(INSTALL_DIR) $(IDIR_XAWTV)/etc/X11/app-defaults $(INSTALL_DATA) $(WRKINST)/etc/X11/app-defaults/Xawtv \ diff --git a/package/xawtv/patches/patch-Makefile b/package/xawtv/patches/patch-Makefile index 814892d9e..bdda68ed2 100644 --- a/package/xawtv/patches/patch-Makefile +++ b/package/xawtv/patches/patch-Makefile @@ -1,5 +1,5 @@ --- xawtv-3.102.orig/Makefile 2011-09-05 19:26:02.000000000 +0200 -+++ xawtv-3.102/Makefile 2011-09-18 21:53:53.767990433 +0200 ++++ xawtv-3.102/Makefile 2011-09-26 21:03:31.839340414 +0200 @@ -1,6 +1,6 @@ # passed to configure @@ -8,10 +8,11 @@ # arch name -- for build directory arch := $(shell echo "arch-`uname -m`-`uname -s`" | tr "A-Z" "a-z") -@@ -21,5 +21,5 @@ tag archive rpm dsc debs pbuild release +@@ -21,5 +21,5 @@ tag archive rpm dsc debs pbuild release $(arch)/Makefile: configure mkdir -p $(arch) - (cd $(arch); ../configure \ +- --prefix=$(prefix) ) + (cd $(arch); ../configure --disable-xft \ - --prefix=$(prefix) ) ++ --prefix=$(prefix) --host=@@GNU_TARGET_NAME@@ ) diff --git a/package/xawtv/patches/patch-Makefile.orig b/package/xawtv/patches/patch-Makefile.orig deleted file mode 100644 index ad7a5446d..000000000 --- a/package/xawtv/patches/patch-Makefile.orig +++ /dev/null @@ -1,10 +0,0 @@ ---- xawtv-3.102.orig/Makefile 2011-09-05 19:26:02.000000000 +0200 -+++ xawtv-3.102/Makefile 2011-09-18 20:40:23.159241503 +0200 -@@ -1,6 +1,6 @@ - - # passed to configure --prefix = /usr/local -+prefix = /usr - - # arch name -- for build directory - arch := $(shell echo "arch-`uname -m`-`uname -s`" | tr "A-Z" "a-z") diff --git a/package/xawtv/patches/patch-console_fbtools_c b/package/xawtv/patches/patch-console_fbtools_c new file mode 100644 index 000000000..aa4d98bb6 --- /dev/null +++ b/package/xawtv/patches/patch-console_fbtools_c @@ -0,0 +1,10 @@ +--- xawtv-3.102.orig/console/fbtools.c 2011-09-05 19:26:02.000000000 +0200 ++++ xawtv-3.102/console/fbtools.c 2011-09-26 21:10:50.109340133 +0200 +@@ -520,6 +520,6 @@ fb_catch_exit_signals(void) + + /* cleanup */ + fb_cleanup(); +- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]); ++ fprintf(stderr,"Oops: %s\n",strsignal(termsig)); + exit(42); + } diff --git a/package/xawtv/patches/patch-console_record_c b/package/xawtv/patches/patch-console_record_c new file mode 100644 index 000000000..bb679f3fe --- /dev/null +++ b/package/xawtv/patches/patch-console_record_c @@ -0,0 +1,11 @@ +--- xawtv-3.102.orig/console/record.c 2011-09-05 19:26:02.000000000 +0200 ++++ xawtv-3.102/console/record.c 2011-09-26 21:09:52.219340170 +0200 +@@ -429,7 +429,7 @@ ctrlc(int signal) + { + if (verbose) + fprintf(stderr,"\n%s - exiting\n", +- sys_siglist[signal]); ++ strsignal(signal)); + stop = 1; + } + diff --git a/package/xawtv/patches/patch-x11_rootv_c b/package/xawtv/patches/patch-x11_rootv_c new file mode 100644 index 000000000..8e3393f54 --- /dev/null +++ b/package/xawtv/patches/patch-x11_rootv_c @@ -0,0 +1,20 @@ +--- xawtv-3.102.orig/x11/rootv.c 2011-09-05 19:26:02.000000000 +0200 ++++ xawtv-3.102/x11/rootv.c 2011-09-26 21:12:26.549340070 +0200 +@@ -133,7 +133,7 @@ catch_sig(int signal) + termsig = signal; + if (verbose) + fprintf(stderr,"received signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + } + + static void usage(FILE *fp) +@@ -422,7 +422,7 @@ main(int argc, char *argv[]) + } + if (verbose && termsig) + fprintf(stderr,"exiting on signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + if (do_mute && have_mute) + XvSetPortAttribute(dpy,port,XV_MUTE,1); + XvStopVideo(dpy,port,win); diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 5ebc65d32..2af6fc389 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://oss.sgi.com/projects/xfs PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ +PKG_CFLINE_XFSPROGS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,XFSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/target/arm/kernel.config.sharp-zaurus b/target/arm/kernel.config.sharp-zaurus index 41f9bcd6d..65b6f94ad 100644 --- a/target/arm/kernel.config.sharp-zaurus +++ b/target/arm/kernel.config.sharp-zaurus @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.39 Kernel Configuration -# Mon Sep 12 18:25:45 2011 +# Fri Sep 30 15:02:47 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -983,7 +983,7 @@ CONFIG_EXT2_FS=y # CONFIG_NILFS2_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y -# CONFIG_FILE_LOCKING is not set +CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y # CONFIG_DNOTIFY is not set CONFIG_INOTIFY_USER=y @@ -1008,11 +1008,8 @@ CONFIG_GENERIC_ACL=y # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=850 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set # CONFIG_NTFS_FS is not set # @@ -1047,6 +1044,8 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 68f906802..084f19112 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -120,6 +120,7 @@ config ADK_KPACKAGE_KMOD_PPDEV config ADK_KPACKAGE_KMOD_FW_LOADER prompt "kmod-fw-loader.................... userspace firmware loading support" tristate + depends on !ADK_TARGET_SYSTEM_SHARP_ZAURUS default n help This may be necessary when using drivers which require diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 92d1997c4..128f42bd3 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -159,6 +159,7 @@ config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS config ADK_KPACKAGE_KMOD_USB_GSPCA prompt "kmod-usb-gspca................... GSPCA webcam framework" + depends on ADK_TARGET_WITH_USB tristate help GSPCA webcam framework -- cgit v1.2.3