diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/ffmpeg/Makefile | 8 | ||||
| -rw-r--r-- | package/ffmpeg/patches/patch-configure | 63 | ||||
| -rw-r--r-- | package/mplayer/Makefile | 7 | ||||
| -rw-r--r-- | package/rxvt-unicode/Makefile | 4 | ||||
| -rw-r--r-- | package/wpa_supplicant/Makefile | 2 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c | 2 |
6 files changed, 14 insertions, 72 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index a2d577fbe..669c168ba 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 0.5 -PKG_RELEASE:= 2 -PKG_MD5SUM:= be8503f15c3b81ba00eb8379ca8dcf33 +PKG_VERSION:= 0.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d6142a9a5821d6a6262a6edb903faa24 PKG_DESCR:= solution to record, convert and stream audio and video PKG_SECTION:= sound PKG_DEPENDS:= libfaad2 @@ -25,6 +25,7 @@ CONFIG_STYLE:= minimal include ${TOPDIR}/mk/cpu.mk CONFIGURE_ARGS:= --prefix=/usr \ + --target-os=linux \ --arch=${CPU_ARCH} \ --enable-cross-compile \ --source-path=${WRKSRC} \ @@ -39,7 +40,6 @@ CONFIGURE_ARGS:= --prefix=/usr \ --disable-ffmpeg \ --disable-ffplay \ --disable-ffserver \ - --disable-vhook \ --enable-gpl \ --enable-swscale \ --enable-postproc \ diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure deleted file mode 100644 index 5ff0e14c8..000000000 --- a/package/ffmpeg/patches/patch-configure +++ /dev/null @@ -1,63 +0,0 @@ ---- ffmpeg-0.5.orig/configure 2009-03-01 18:57:14.000000000 +0100 -+++ ffmpeg-0.5/configure 2010-01-06 20:34:48.343750000 +0100 -@@ -1167,7 +1167,7 @@ arch=`uname -m` - cpu="generic" - - # OS --target_os=$(tolower $(uname -s)) -+target_os=linux - - # configurable options - enable debug -@@ -2486,51 +2486,6 @@ cmp -s $TMPH config.h && - - rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH - --# build tree in object directory if source path is different from current one --if enabled source_path_used; then -- DIRS="\ -- doc \ -- libavcodec \ -- libavcodec/alpha \ -- libavcodec/arm \ -- libavcodec/bfin \ -- libavcodec/mlib \ -- libavcodec/ppc \ -- libavcodec/sh4 \ -- libavcodec/sparc \ -- libavcodec/x86 \ -- libavdevice \ -- libavfilter \ -- libavformat \ -- libavutil \ -- libpostproc \ -- libswscale \ -- tests \ -- tools \ -- vhook \ -- " -- FILES="\ -- Makefile \ -- common.mak \ -- subdir.mak \ -- doc/texi2pod.pl \ -- libavcodec/Makefile \ -- libavdevice/Makefile \ -- libavfilter/Makefile \ -- libavformat/Makefile \ -- libavutil/Makefile \ -- libpostproc/Makefile \ -- libswscale/Makefile \ -- " -- for dir in $DIRS ; do -- mkdir -p $dir -- done -- for f in $FILES ; do -- $ln_s "$source_path/$f" $f -- done --fi -- -- - # build pkg-config files - - pkgconfig_generate(){ diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index bf6279350..762994139 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -34,8 +34,8 @@ CONFIG_STYLE:= manual FAKE_FLAGS+= INSTALLSTRIP='' -ifeq (${ADK_LINUX_MIPS64_LOONGSON},y) -XAKE_FLAGS+= -DHAVE_LOONGSON -DARCH_MIPS64 +ifeq (${ADK_LINUX_MIPS64_LEMOTE},y) +EXTRA_CFLAGS:= -DARCH_MIPS64 endif # Somehow this include path is missing here, although other @@ -89,6 +89,7 @@ pre-configure: --disable-mencoder \ --enable-fbdev \ --enable-alsa \ + --enable-tv \ --enable-v4l2 \ --enable-png \ --enable-jpeg \ @@ -124,6 +125,8 @@ pre-configure: --disable-liblzo \ --disable-xinerama \ --disable-vidix \ + --disable-gl \ + --extra-cflags="${EXTRA_CFLAGS}" \ ${CONFIGURE_CPU_OPTS} \ ${CONFIGURE_DEBUG} \ ${CONFIGURE_DIRECTFB} \ diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile index 5706fc573..297b8018c 100644 --- a/package/rxvt-unicode/Makefile +++ b/package/rxvt-unicode/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 49bb52c99e002bf85eb41d8385d903b5 PKG_DESCR:= x-term with unicode support PKG_SECTION:= x11 -PKG_DEPENDS:= libx11 fontconfig libxft libxml2 -PKG_BUILDDEP+= libX11 fontconfig libXft libxml2 +PKG_DEPENDS:= libx11 fontconfig libxft libxml2 libexpat +PKG_BUILDDEP+= libX11 fontconfig libXft libxml2 expat PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html PKG_SITES:= http://dist.schmorp.de/rxvt-unicode/ diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index e9f603065..905875078 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0e2cb7e4c35667351d8b7ec28c783e6a PKG_DESCR:= WPA Supplicant with support for WPA and WPA2 PKG_SECTION:= net +PKG_DEPENDS:= libnl +PKG_BUILDDEP+= libnl ifeq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL},y) PKG_BUILDDEP+= openssl endif diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c index 70bd7b279..ccbe060a4 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c @@ -38,7 +38,7 @@ return FALSE; } #endif -+ xf86Msg(X_INFO,"%s: ioBase 0x%lx\n", (unsigned long)ioBase); ++ xf86Msg(X_INFO,"ioBase 0x%lx\n", (unsigned long)ioBase); } close(fd); -#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) |