diff options
Diffstat (limited to 'package')
32 files changed, 421 insertions, 101 deletions
diff --git a/package/corosync/patches/patch-Makefile_in b/package/corosync/patches/patch-Makefile_in new file mode 100644 index 000000000..38cf13b7c --- /dev/null +++ b/package/corosync/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- corosync-1.4.1.orig/Makefile.in 2011-07-26 10:13:38.000000000 +0200 ++++ corosync-1.4.1/Makefile.in 2011-10-12 06:02:03.291467847 +0200 +@@ -323,7 +323,7 @@ corosysconf_DATA = conf/corosync.conf.ex + conf/corosync.conf.example.udpu + + SUBDIRS = include lcr lib exec services tools test pkgconfig \ +- man init conf ++ init conf + + RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \ + --define "_specdir $(abs_builddir)" \ diff --git a/package/gcc/patches/no-lib64.patch b/package/gcc/patches/no-lib64.patch new file mode 100644 index 000000000..5c6e0b045 --- /dev/null +++ b/package/gcc/patches/no-lib64.patch @@ -0,0 +1,100 @@ +diff -Nur gcc-4.5.3.orig/gcc/config/i386/linux64.h gcc-4.5.3/gcc/config/i386/linux64.h +--- gcc-4.5.3.orig/gcc/config/i386/linux64.h 2010-03-24 21:44:48.000000000 +0100 ++++ gcc-4.5.3/gcc/config/i386/linux64.h 2011-08-24 06:35:30.000000000 +0200 +@@ -59,7 +59,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + + #if TARGET_64BIT_DEFAULT + #define SPEC_32 "m32" +diff -Nur gcc-4.5.3.orig/gcc/config/i386/t-linux64 gcc-4.5.3/gcc/config/i386/t-linux64 +--- gcc-4.5.3.orig/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200 ++++ gcc-4.5.3/gcc/config/i386/t-linux64 2011-08-24 06:35:30.000000000 +0200 +@@ -25,7 +25,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib +diff -Nur gcc-4.5.3.orig/gcc/config/mips/linux64.h gcc-4.5.3/gcc/config/mips/linux64.h +--- gcc-4.5.3.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100 ++++ gcc-4.5.3/gcc/config/mips/linux64.h 2011-08-24 06:35:30.000000000 +0200 +@@ -36,9 +36,9 @@ + %{profile:-lc_p} %{!profile:-lc}}" + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" +-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" ++#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) + +diff -Nur gcc-4.5.3.orig/gcc/config/mips/t-linux64 gcc-4.5.3/gcc/config/mips/t-linux64 +--- gcc-4.5.3.orig/gcc/config/mips/t-linux64 2009-04-21 21:03:23.000000000 +0200 ++++ gcc-4.5.3/gcc/config/mips/t-linux64 2011-08-24 06:35:30.000000000 +0200 +@@ -18,7 +18,7 @@ + + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 +-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 ++MULTILIB_OSDIRNAMES = ../lib ../lib ../lib + + EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o + +diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/linux64.h gcc-4.5.3/gcc/config/rs6000/linux64.h +--- gcc-4.5.3.orig/gcc/config/rs6000/linux64.h 2010-11-17 07:09:53.000000000 +0100 ++++ gcc-4.5.3/gcc/config/rs6000/linux64.h 2011-08-24 06:35:30.000000000 +0200 +@@ -341,7 +341,7 @@ + #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" + #if UCLIBC_DEFAULT +diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 gcc-4.5.3/gcc/config/rs6000/t-linux64 +--- gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 2009-04-21 21:03:23.000000000 +0200 ++++ gcc-4.5.3/gcc/config/rs6000/t-linux64 2011-08-24 06:35:30.000000000 +0200 +@@ -36,7 +36,7 @@ + MULTILIB_EXTRA_OPTS = fPIC mstrict-align + MULTILIB_EXCEPTIONS = m64/msoft-float + MULTILIB_EXCLUSIONS = m64/!m32/msoft-float +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof + MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) + + softfp_wrap_start := '\#ifndef __powerpc64__' +diff -Nur gcc-4.5.3.orig/gcc/config/sparc/linux64.h gcc-4.5.3/gcc/config/sparc/linux64.h +--- gcc-4.5.3.orig/gcc/config/sparc/linux64.h 2010-09-22 23:15:37.000000000 +0200 ++++ gcc-4.5.3/gcc/config/sparc/linux64.h 2011-08-24 06:36:52.000000000 +0200 +@@ -110,7 +110,7 @@ + /* If ELF is the default format, we should not use /lib/elf. */ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" + + #ifdef SPARC_BI_ARCH + +diff -Nur gcc-4.5.3.orig/gcc/config/sparc/t-linux64 gcc-4.5.3/gcc/config/sparc/t-linux64 +--- gcc-4.5.3.orig/gcc/config/sparc/t-linux64 2010-10-04 18:54:26.000000000 +0200 ++++ gcc-4.5.3/gcc/config/sparc/t-linux64 2011-08-24 06:37:15.000000000 +0200 +@@ -26,7 +26,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib 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/libmpdclient/Makefile b/package/libmpdclient/Makefile index 960dc668b..a7f6b9303 100644 --- a/package/libmpdclient/Makefile +++ b/package/libmpdclient/Makefile @@ -15,11 +15,12 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/} PKG_SUBPKGS:= LIBMPDCLIENT LIBMPDCLIENT_DEV PKGSD_LIBMPDCLIENT_DEV:=headers for interfacing MPD PKGSC_LIBMPDCLIENT_DEV:=devel +PKGSS_LIBMPDCLIENT_DEV:=libmpdclient include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBMPDCLIENT,libmpdclient,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBMPDCLIENT_DEV,libmpdclient-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMPDCLIENT_DEV},${PKGSC_LIBMPDCLIENT_DEV})) +$(eval $(call PKG_template,LIBMPDCLIENT_DEV,libmpdclient-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBMPDCLIENT_DEV},${PKGSD_LIBMPDCLIENT_DEV},${PKGSC_LIBMPDCLIENT_DEV})) CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index afb3b50a0..243cca04f 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -31,6 +31,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_IBM_X40),y) CONFIGURE_ARGS+= --target=x86-linux-gcc --as=yasm endif +ifeq ($(ADK_TARGET_SYSTEM_INTEL_ATOM),y) +CONFIGURE_ARGS+= --target=x86-linux-gcc --as=yasm +endif ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_WRAP),y) CONFIGURE_ARGS+= --target=x86-linux-gcc --as=yasm endif 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/openssl/patches/patch-Makefile_org b/package/openssl/patches/patch-Makefile_org new file mode 100644 index 000000000..f72030d14 --- /dev/null +++ b/package/openssl/patches/patch-Makefile_org @@ -0,0 +1,11 @@ +--- openssl-1.0.0d.orig/Makefile.org 2010-01-27 17:06:58.000000000 +0100 ++++ openssl-1.0.0d/Makefile.org 2011-10-12 06:07:40.993200000 +0200 +@@ -109,7 +109,7 @@ LIBKRB5= + ZLIB_INCLUDE= + LIBZLIB= + +-DIRS= crypto ssl engines apps test tools ++DIRS= crypto ssl engines apps tools + ENGDIRS= ccgost + SHLIBDIRS= crypto ssl + 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 <stdarg.h> #include <stdlib.h> 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 <sys/types.h> @@ -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/strace/Makefile b/package/strace/Makefile index 8a0bfb694..548891921 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -4,23 +4,27 @@ include ${TOPDIR}/rules.mk PKG_NAME:= strace -PKG_VERSION:= 4.5.20 +PKG_VERSION:= 4.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 64dfe10d9db0c1e34030891695ffca4b +PKG_MD5SUM:= e537b2b1afeec70c0e6e27a0d0fd671e PKG_DESCR:= System call trace program PKG_SECTION:= debug PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,STRACE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_STATIC),y) +TARGET_CFLAGS+= -static +endif + INSTALL_STYLE:= manual do-install: - ${INSTALL_DIR} ${IDIR_STRACE}/usr/sbin/ - ${INSTALL_BIN} ${WRKBUILD}/strace ${IDIR_STRACE}/usr/sbin/ + ${INSTALL_DIR} ${IDIR_STRACE}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/strace ${IDIR_STRACE}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/strace/patches/patch-Makefile_in b/package/strace/patches/patch-Makefile_in index c93da1102..38329e3ac 100644 --- a/package/strace/patches/patch-Makefile_in +++ b/package/strace/patches/patch-Makefile_in @@ -1,10 +1,11 @@ ---- strace-4.5.20.orig/Makefile.in 2010-04-14 21:41:05.000000000 +0200 -+++ strace-4.5.20/Makefile.in 2010-12-28 22:43:17.000000000 +0100 -@@ -242,6 +242,7 @@ EXTRA_DIST = $(man_MANS) errnoent.sh sig - linux/ioctlent.h linux/errnoent.h linux/signalent.h \ - linux/syscall.h linux/dummy.h \ - linux/i386/syscallent.h \ -+ linux/cris/syscallent.h \ - linux/alpha/errnoent.h linux/alpha/ioctlent.h \ - linux/alpha/signalent.h linux/alpha/syscallent.h \ - linux/arm/syscallent.h linux/arm/syscallent1.h \ +--- strace-4.6.orig/Makefile.in 2011-03-15 19:23:18.000000000 +0100 ++++ strace-4.6/Makefile.in 2011-09-02 09:14:19.198484990 +0200 +@@ -270,7 +270,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = tests ++SUBDIRS = + man_MANS = strace.1 + bin_SCRIPTS = strace-graph + diff --git a/package/strace/patches/patch-net_c b/package/strace/patches/patch-net_c deleted file mode 100644 index a0dc31029..000000000 --- a/package/strace/patches/patch-net_c +++ /dev/null @@ -1,10 +0,0 @@ ---- strace-4.5.19.orig/net.c 2009-09-01 21:53:29.000000000 +0200 -+++ strace-4.5.19/net.c 2009-12-03 23:35:36.000000000 +0100 -@@ -53,6 +53,7 @@ - #include <net/if.h> - #if defined(LINUX) - #include <asm/types.h> -+#include <linux/netlink.h> - #if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC__ + __GLIBC_MINOR__ >= 3) - # include <netipx/ipx.h> - #else diff --git a/package/strace/src/linux/crisv32/ioctlent.h.in b/package/strace/src/linux/crisv32/ioctlent.h.in new file mode 100644 index 000000000..52ac99ba0 --- /dev/null +++ b/package/strace/src/linux/crisv32/ioctlent.h.in @@ -0,0 +1 @@ +#include "../i386/ioctlent.h.in" < |