summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/DirectFB/Makefile1
-rw-r--r--package/MesaLib/Makefile4
-rw-r--r--package/beecrypt/Makefile1
-rw-r--r--package/exmap/Makefile2
-rw-r--r--package/exmap/patches/patch-kernel_exmap_c59
-rw-r--r--package/firefox/Makefile5
-rw-r--r--package/freeglut/Makefile7
-rw-r--r--package/freeglut/patches/patch-ltmain_sh11
-rw-r--r--package/glu/Makefile28
-rw-r--r--package/gnutls/Makefile2
-rw-r--r--package/harfbuzz/Makefile2
-rw-r--r--package/libsigc++/Makefile2
-rw-r--r--package/libtorrent/Makefile1
-rw-r--r--package/log4cplus/Makefile2
-rw-r--r--package/log4cxx/Makefile2
-rw-r--r--package/pango/Makefile1
-rw-r--r--package/pcre/Makefile1
-rw-r--r--package/poppler/Makefile2
-rw-r--r--package/squid/Makefile2
-rw-r--r--package/strace/Makefile2
-rw-r--r--package/strace/patches/patch-defs_h43
-rw-r--r--package/strace/patches/patch-defs_h.orig14
-rw-r--r--package/strace/patches/patch-process_c28
-rw-r--r--package/strace/patches/patch-signal_c24
-rw-r--r--package/strace/patches/patch-syscall_c20
-rw-r--r--package/strace/patches/patch-util_c20
-rw-r--r--package/vlc/Makefile1
27 files changed, 205 insertions, 82 deletions
diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index 14eef4e6e..3c58d34a0 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
CONFIGURE_ARGS+= --with-inputdrivers=linuxinput,keyboard,ps2mouse \
--with-gfxdrivers=none \
--without-tools \
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 694c6b0b1..446f465ab 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -26,9 +26,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
-XAKE_FLAGS+= GCC_HONOUR_COPTS=s
-
ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
DRI_DRIVERS:=i915
endif
@@ -36,7 +33,6 @@ endif
CONFIGURE_ARGS+= --disable-static \
--disable-gallium-llvm \
--with-gallium-drivers=swrast \
- --with-driver=dri \
--disable-gles1 \
--disable-gles2 \
--with-dri-drivers=${DRI_DRIVERS},swrast
diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile
index 4a6182384..934788dcb 100644
--- a/package/beecrypt/Makefile
+++ b/package/beecrypt/Makefile
@@ -19,7 +19,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
CONFIGURE_ARGS+= --without-cplusplus \
--without-python \
--without-java
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 008ce253f..b9c67703d 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= exmap
PKG_VERSION:= 0.4.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 55aec784e214037e61400287a55b5426
PKG_DESCR:= memory analysing client tool
PKG_SECTION:= debug
diff --git a/package/exmap/patches/patch-kernel_exmap_c b/package/exmap/patches/patch-kernel_exmap_c
index 0a641298c..85c127147 100644
--- a/package/exmap/patches/patch-kernel_exmap_c
+++ b/package/exmap/patches/patch-kernel_exmap_c
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- exmap-console-0.4.1.orig/kernel/exmap.c 2006-10-24 20:45:11.000000000 +0200
-+++ exmap-console-0.4.1/kernel/exmap.c 2009-06-11 12:31:45.000000000 +0200
++++ exmap-console-0.4.1/kernel/exmap.c 2013-10-24 12:27:35.000000000 +0200
@@ -392,7 +392,11 @@ int setup_from_pid(pid_t pid)
struct task_struct *tsk;
int errcode = -EINVAL;
@@ -13,27 +13,54 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
if (tsk == NULL) {
printk (KERN_ALERT
"/proc/%s: can't find task for pid %d\n",
-@@ -507,7 +511,7 @@ int init_module ()
- NULL);
+@@ -497,40 +501,29 @@ static int procfile_read (char *buffer,
+ return ret;
+ }
+
++static const struct file_operations proc_file_fops = {
++ .owner = THIS_MODULE,
++ .write = procfile_write,
++ .read = procfile_read,
++};
++
++
+ int init_module ()
+ {
+ struct proc_dir_entry *exmap_proc_file;
+ printk (KERN_INFO "/proc/%s: insert\n", PROCFS_NAME);
+
+- exmap_proc_file = create_proc_entry (PROCFS_NAME,
++ exmap_proc_file = proc_create (PROCFS_NAME,
+ 0644,
+- NULL);
++ NULL,
++ &proc_file_fops);
if (exmap_proc_file == NULL) {
- remove_proc_entry (PROCFS_NAME, &proc_root);
-+ remove_proc_entry (PROCFS_NAME, NULL);
printk (KERN_ALERT "/proc/%s: could not initialize\n",
PROCFS_NAME);
return -ENOMEM;
-@@ -515,7 +519,6 @@ int init_module ()
+ }
- exmap_proc_file->read_proc = procfile_read;
- exmap_proc_file->write_proc = procfile_write;
+- exmap_proc_file->read_proc = procfile_read;
+- exmap_proc_file->write_proc = procfile_write;
- exmap_proc_file->owner = THIS_MODULE;
-
- /* exmap_proc_file->mode = S_IFREG | S_IRUGO; */
- /* TODO - this is quite probably a security problem */
-@@ -532,5 +535,5 @@ int init_module ()
- void cleanup_module ()
- {
- printk (KERN_INFO "/proc/%s: remove\n", PROCFS_NAME);
-- remove_proc_entry (PROCFS_NAME, &proc_root);
-+ remove_proc_entry (PROCFS_NAME, NULL);
+-
+- /* exmap_proc_file->mode = S_IFREG | S_IRUGO; */
+- /* TODO - this is quite probably a security problem */
+- exmap_proc_file->mode = 0666;
+-
+- exmap_proc_file->uid = 0;
+- exmap_proc_file->gid = 0;
+- exmap_proc_file->size = 0;
+-
+ init_local_data();
+ return 0;
}
+-
+-void cleanup_module ()
+-{
+- printk (KERN_INFO "/proc/%s: remove\n", PROCFS_NAME);
+- remove_proc_entry (PROCFS_NAME, &proc_root);
+-}
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 2e72e0073..9a9fc399c 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -21,9 +21,9 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_
PKG_NOPARALLEL:= 1
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= x86 x86_64 native mips
+PKG_ARCH_DEPENDS:= arm x86 x86_64 native mips
PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin
-PKG_SYSTEM_DEPENDS:= tarox-pc ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 qemu-mips64el
+PKG_SYSTEM_DEPENDS:= tarox-pc ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 qemu-mips64el raspberry-pi
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
WRKDIST= ${WRKDIR}/mozilla-release
@@ -104,7 +104,6 @@ CONFIGURE_ARGS+= --enable-application=browser \
--disable-safe-browsing \
--disable-elf-hack
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
XAKE_FLAGS+= OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)
XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
index 8dbc3f498..c5fcd5a18 100644
--- a/package/freeglut/Makefile
+++ b/package/freeglut/Makefile
@@ -4,12 +4,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= freeglut
-PKG_VERSION:= 2.6.0
+PKG_VERSION:= 2.8.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 39f0f2de89f399529d2b981188082218
+PKG_MD5SUM:= 918ffbddcffbac83c218bc52355b6d5a
PKG_DESCR:= OpenGL Utility Toolkit libraries
PKG_SECTION:= libs
-PKG_BUILDDEP:= MesaLib
+PKG_DEPENDS:= libglu
+PKG_BUILDDEP:= glu
PKG_URL:= http://freeglut.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freeglut/}
PKG_NEED_CXX:= 1
diff --git a/package/freeglut/patches/patch-ltmain_sh b/package/freeglut/patches/patch-ltmain_sh
deleted file mode 100644
index 7ae2ccf9f..000000000
--- a/package/freeglut/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- freeglut-2.6.0.orig/ltmain.sh 2008-04-29 23:33:55.000000000 +0200
-+++ freeglut-2.6.0/ltmain.sh 2011-01-14 21:40:47.000000000 +0100
-@@ -1676,7 +1676,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/glu/Makefile b/package/glu/Makefile
new file mode 100644
index 000000000..d24c6fa6f
--- /dev/null
+++ b/package/glu/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= glu
+PKG_VERSION:= 9.0.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= be9249132ff49275461cf92039083030
+PKG_DESCR:= GLU library
+PKG_SECTION:= libs
+PKG_URL:= http://cgit.freedesktop.org/mesa/glu/
+PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/glu/
+PKG_LIBNAME:= libglu
+PKG_OPTS:= dev
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBGLU,libglu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libglu-install:
+ $(INSTALL_DIR) $(IDIR_LIBGLU)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libGLU.so* \
+ $(IDIR_LIBGLU)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 912912b2b..9f2c1bae9 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --enable-cryptodev
endif
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_LDFLAGS+= -pthread -L$(STAGING_DIR)/usr/lib64
+TARGET_LDFLAGS+= -pthread
CONFIGURE_ARGS+= --disable-rpath \
--without-libz-prefix \
--without-p11-kit
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index 452b8eafa..d2530b5a1 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -22,8 +22,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
-
harfbuzz-install:
$(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib
$(CP) $(WRKINST)/usr/lib/libharfbuzz*.so* \
diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile
index c6bb859ee..f82056835 100644
--- a/package/libsigc++/Makefile
+++ b/package/libsigc++/Makefile
@@ -19,8 +19,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBSIGCXX,libsigc++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
-
libsigc++-install:
${INSTALL_DIR} ${IDIR_LIBSIGCXX}/usr/lib
${CP} ${WRKINST}/usr/lib/libsigc-2.0.so* ${IDIR_LIBSIGCXX}/usr/lib/
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index 274e6ba25..bbcada2f6 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-aligned
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
libtorrent-install:
${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib
diff --git a/package/log4cplus/Makefile b/package/log4cplus/Makefile
index 8f557c600..4fd0fbe13 100644
--- a/package/log4cplus/Makefile
+++ b/package/log4cplus/Makefile
@@ -19,8 +19,6 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
-
$(eval $(call PKG_template,LOG4CPLUS,log4cplus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
log4cplus-install:
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
index 14c5d5473..d34d8a2f0 100644
--- a/package/log4cxx/Makefile
+++ b/package/log4cxx/Makefile
@@ -24,8 +24,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LOG4CXX,log4cxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
-
log4cxx-install:
${INSTALL_DIR} ${IDIR_LOG4CXX}/usr/lib
${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_LOG4CXX}/usr/lib
diff --git a/package/pango/Makefile b/package/pango/Makefile
index b3979b9e2..a5e2aca9f 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
CONFIGURE_ENV+= ac_cv_path_EGREP="grep -E"
pango-install:
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 1d3cd131f..12738c2cb 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -28,7 +28,6 @@ $(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_D
$(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRECPP},${PKG_SECTION}))
XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS}
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
libpcre-install:
${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib
diff --git a/package/poppler/Makefile b/package/poppler/Makefile
index fe61ae358..1e15a4340 100644
--- a/package/poppler/Makefile
+++ b/package/poppler/Makefile
@@ -19,8 +19,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,POPPLER,poppler,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
-
poppler-install:
$(INSTALL_DIR) $(IDIR_POPPLER)/usr/lib
$(CP) $(WRKINST)/usr/lib/libpoppler*.so* \
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 12a9fb938..74c7d2257 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -67,8 +67,6 @@ endif
include ${TOPDIR}/mk/package.mk
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
-
define PKG_mod_template
INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install
diff --git a/package/strace/Makefile b/package/strace/Makefile
index a09877355..303cf71f8 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= strace
PKG_VERSION:= 4.8
-PKG_RELEASE:= 2
+PKG_RELEASE:= 4
PKG_MD5SUM:= c575ef43829586801f514fd91bfe7575
PKG_DESCR:= System call trace program
PKG_SECTION:= debug
diff --git a/package/strace/patches/patch-defs_h b/package/strace/patches/patch-defs_h
index 50d061348..d4a359ef4 100644
--- a/package/strace/patches/patch-defs_h
+++ b/package/strace/patches/patch-defs_h
@@ -1,6 +1,43 @@
--- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/defs.h 2013-08-14 08:51:03.000000000 +0200
-@@ -162,7 +162,7 @@ extern char *stpcpy(char *dst, const cha
++++ strace-4.8/defs.h 2013-10-25 13:21:18.000000000 +0200
+@@ -37,6 +37,28 @@
+ # endif
+ #endif
+
++#ifdef ARM
++struct pt_regs { long uregs[18]; };
++#define ARM_cpsr uregs[16]
++#define ARM_pc uregs[15]
++#define ARM_lr uregs[14]
++#define ARM_sp uregs[13]
++#define ARM_ip uregs[12]
++#define ARM_fp uregs[11]
++#define ARM_r10 uregs[10]
++#define ARM_r9 uregs[9]
++#define ARM_r8 uregs[8]
++#define ARM_r7 uregs[7]
++#define ARM_r6 uregs[6]
++#define ARM_r5 uregs[5]
++#define ARM_r4 uregs[4]
++#define ARM_r3 uregs[3]
++#define ARM_r2 uregs[2]
++#define ARM_r1 uregs[1]
++#define ARM_r0 uregs[0]
++#define ARM_ORIG_r0 uregs[17]
++#endif
++
+ #ifdef MIPS
+ # include <sgidefs.h>
+ # if _MIPS_SIM == _MIPS_SIM_ABI64
+@@ -155,14 +177,14 @@ extern char *stpcpy(char *dst, const cha
+ || defined(METAG) \
+ || defined(TILE) \
+ || defined(XTENSA) \
+- ) && defined(__GLIBC__)
++ ) && defined(__linux__)
+ # include <sys/ptrace.h>
+ #else
+ /* Work around awkward prototype in ptrace.h. */
# define ptrace xptrace
# include <sys/ptrace.h>
# undef ptrace
@@ -9,7 +46,7 @@
# define __KERNEL__
# include <asm/ptrace.h>
# undef __KERNEL__
-@@ -222,11 +222,6 @@ extern long ptrace(int, int, char *, lon
+@@ -222,11 +244,6 @@ extern long ptrace(int, int, char *, lon
# define PTRACE_EVENT_EXIT 6
#endif
diff --git a/package/strace/patches/patch-defs_h.orig b/package/strace/patches/patch-defs_h.orig
deleted file mode 100644
index 60ca6e97a..000000000
--- a/package/strace/patches/patch-defs_h.orig
+++ /dev/null
@@ -1,14 +0,0 @@
---- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/defs.h 2013-08-14 08:01:46.000000000 +0200
-@@ -222,11 +222,6 @@ extern long ptrace(int, int, char *, lon
- # define PTRACE_EVENT_EXIT 6
- #endif
-
--#if !defined(__GLIBC__)
--# define PTRACE_PEEKUSER PTRACE_PEEKUSR
--# define PTRACE_POKEUSER PTRACE_POKEUSR
--#endif
--
- #if USE_SEIZE
- # undef PTRACE_SEIZE
- # define PTRACE_SEIZE 0x4206
diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c
index 7fa9541f1..3384b1f4f 100644
--- a/package/strace/patches/patch-process_c
+++ b/package/strace/patches/patch-process_c
@@ -1,6 +1,26 @@
--- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200
-+++ strace-4.8/process.c 2013-08-14 08:47:15.000000000 +0200
-@@ -2857,7 +2857,7 @@ sys_sched_setscheduler(struct tcb *tcp)
++++ strace-4.8/process.c 2013-10-25 13:17:58.000000000 +0200
+@@ -55,19 +55,6 @@
+ # endif
+ #endif
+
+-#ifdef HAVE_LINUX_PTRACE_H
+-# undef PTRACE_SYSCALL
+-# ifdef HAVE_STRUCT_IA64_FPREG
+-# define ia64_fpreg XXX_ia64_fpreg
+-# endif
+-# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+-# define pt_all_user_regs XXX_pt_all_user_regs
+-# endif
+-# include <linux/ptrace.h>
+-# undef ia64_fpreg
+-# undef pt_all_user_regs
+-#endif
+-
+ #if defined(SPARC64)
+ # define r_pc r_tpc
+ # undef PTRACE_GETREGS
+@@ -2857,7 +2844,7 @@ sys_sched_setscheduler(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[2], &p) < 0)
tprintf(", %#lx", tcp->u_arg[2]);
else
@@ -9,7 +29,7 @@
}
return 0;
}
-@@ -2872,7 +2872,7 @@ sys_sched_getparam(struct tcb *tcp)
+@@ -2872,7 +2859,7 @@ sys_sched_getparam(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[1], &p) < 0)
tprintf("%#lx", tcp->u_arg[1]);
else
@@ -18,7 +38,7 @@
}
return 0;
}
-@@ -2885,7 +2885,7 @@ sys_sched_setparam(struct tcb *tcp)
+@@ -2885,7 +2872,7 @@ sys_sched_setparam(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[1], &p) < 0)
tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
else
diff --git a/package/strace/patches/patch-signal_c b/package/strace/patches/patch-signal_c
index 27e3d0d77..30fb0dfdd 100644
--- a/package/strace/patches/patch-signal_c
+++ b/package/strace/patches/patch-signal_c
@@ -1,6 +1,24 @@
--- strace-4.8.orig/signal.c 2013-05-23 15:41:23.000000000 +0200
-+++ strace-4.8/signal.c 2013-09-13 16:20:20.000000000 +0200
-@@ -61,6 +61,7 @@
++++ strace-4.8/signal.c 2013-10-25 14:36:47.000000000 +0200
+@@ -43,17 +43,6 @@
+ # ifndef PTRACE_POKEUSR
+ # define PTRACE_POKEUSR PTRACE_POKEUSER
+ # endif
+-#elif defined(HAVE_LINUX_PTRACE_H)
+-# undef PTRACE_SYSCALL
+-# ifdef HAVE_STRUCT_IA64_FPREG
+-# define ia64_fpreg XXX_ia64_fpreg
+-# endif
+-# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+-# define pt_all_user_regs XXX_pt_all_user_regs
+-# endif
+-# include <linux/ptrace.h>
+-# undef ia64_fpreg
+-# undef pt_all_user_regs
+ #endif
+
+ #ifdef IA64
+@@ -61,6 +50,7 @@
#endif
#if defined(SPARC) || defined(SPARC64) || defined(MIPS)
@@ -8,7 +26,7 @@
typedef struct {
struct pt_regs si_regs;
int si_mask;
-@@ -815,7 +816,7 @@ sys_sigreturn(struct tcb *tcp)
+@@ -815,7 +805,7 @@ sys_sigreturn(struct tcb *tcp)
{
#if defined(ARM)
if (entering(tcp)) {
diff --git a/package/strace/patches/patch-syscall_c b/package/strace/patches/patch-syscall_c
new file mode 100644
index 000000000..3f15e9297
--- /dev/null
+++ b/package/strace/patches/patch-syscall_c
@@ -0,0 +1,20 @@
+--- strace-4.8.orig/syscall.c 2013-05-14 16:10:42.000000000 +0200
++++ strace-4.8/syscall.c 2013-10-25 14:52:35.000000000 +0200
+@@ -40,17 +40,6 @@
+ # ifndef PTRACE_PEEKUSR
+ # define PTRACE_PEEKUSR PTRACE_PEEKUSER
+ # endif
+-#elif defined(HAVE_LINUX_PTRACE_H)
+-# undef PTRACE_SYSCALL
+-# ifdef HAVE_STRUCT_IA64_FPREG
+-# define ia64_fpreg XXX_ia64_fpreg
+-# endif
+-# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+-# define pt_all_user_regs XXX_pt_all_user_regs
+-# endif
+-# include <linux/ptrace.h>
+-# undef ia64_fpreg
+-# undef pt_all_user_regs
+ #endif
+
+ #if defined(SPARC64)
diff --git a/package/strace/patches/patch-util_c b/package/strace/patches/patch-util_c
new file mode 100644
index 000000000..e5bf2cfc9
--- /dev/null
+++ b/package/strace/patches/patch-util_c
@@ -0,0 +1,20 @@
+--- strace-4.8.orig/util.c 2013-05-06 20:23:01.000000000 +0200
++++ strace-4.8/util.c 2013-10-25 14:54:06.000000000 +0200
+@@ -47,17 +47,6 @@
+ #ifdef HAVE_SYS_REG_H
+ # include <sys/reg.h>
+ # define PTRACE_PEEKUSR PTRACE_PEEKUSER
+-#elif defined(HAVE_LINUX_PTRACE_H)
+-# undef PTRACE_SYSCALL
+-# ifdef HAVE_STRUCT_IA64_FPREG
+-# define ia64_fpreg XXX_ia64_fpreg
+-# endif
+-# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+-# define pt_all_user_regs XXX_pt_all_user_regs
+-# endif
+-# include <linux/ptrace.h>
+-# undef ia64_fpreg
+-# undef pt_all_user_regs
+ #endif
+
+ int
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 27d98e0fa..6c73f3fb9 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -23,7 +23,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,VLC,vlc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS+= -fPIC
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
CONFIGURE_ENV+= ac_cv_func_sched_getaffinity=no
CONFIGURE_ARGS+= --disable-lua \
--disable-dbus \