summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile4
-rw-r--r--package/binutils/Makefile2
-rw-r--r--package/busybox/config/archival/Config.in2
-rw-r--r--package/busybox/config/networking/Config.in8
-rw-r--r--package/ffmpeg/Makefile54
-rw-r--r--package/ffmpeg/patches/patch-configure11
-rw-r--r--package/mpc/Makefile19
-rw-r--r--package/mplayer/Makefile119
-rw-r--r--package/mysql/Makefile6
-rw-r--r--package/mysql/patches/patch-Makefile_in11
-rw-r--r--package/mysql/patches/patch-configure19
-rw-r--r--package/mysql/patches/patch-include_config_h_in21
-rw-r--r--package/mysql/patches/patch-include_my_global_h10
-rw-r--r--package/mysql/patches/patch-include_mysql_h12
-rw-r--r--package/mysql/patches/patch-include_mysql_h_pp7
-rw-r--r--package/mysql/patches/patch-sql_sql_builtin_cc15
-rw-r--r--package/weechat/Makefile1
-rw-r--r--package/xf86-video-siliconmotion/patches/xf86-video-siliconmotion-1.7.3-fix-loongson.patch182
-rw-r--r--package/xtrans/Makefile4
19 files changed, 226 insertions, 281 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index d47a134..37f8cbc 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 21
+PKG_RELEASE:= 22
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
@@ -73,6 +73,8 @@ endif
${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow
git log -1|head -1|sed -e 's#commit ##' \
> $(IDIR_BASE_FILES)/etc/adkversion
+ test -z $(ADK_TARGET) || \
+ echo $(ADK_TARGET) > $(IDIR_BASE_FILES)/etc/adktarget
ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},)
gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz
endif
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 8bcda82..37b2c82 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -4,7 +4,7 @@
include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/binutils/Makefile.inc
-PKG_DESCR:= binary utilities (nm, objdump, ar, as, ..)
+PKG_DESCR:= binary utilities (nm, objdump, as, ..)
PKG_SECTION:= lang
PKG_HOST_DEPENDS:= !cygwin
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index de605ee..104fb86 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -195,7 +195,7 @@ config BUSYBOX_IPKG
bool "ipkg"
default n
select BUSYBOX_MD5SUM
- select BUSYBOX_WGET
+ depends on BUSYBOX_WGET || ADK_PACKAGE_WGET
depends on ADK_TARGET_PACKAGE_IPKG
help
ipkg is the itsy package management system.
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 2e0bfd3..d755490 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -952,8 +952,8 @@ config BUSYBOX_VCONFIG
config BUSYBOX_WGET
bool "wget"
- depends on !ADK_PACKAGE_WGET
default y
+ depends on !ADK_PACKAGE_WGET
help
wget is a utility for non-interactive download of files from HTTP,
HTTPS, and FTP servers.
@@ -961,21 +961,21 @@ config BUSYBOX_WGET
config BUSYBOX_FEATURE_WGET_STATUSBAR
bool "Enable a nifty process meter (+2k)"
default y
- depends on BUSYBOX_WGET
+ depends on BUSYBOX_WGET && !ADK_PACKAGE_WGET
help
Enable the transfer progress bar for wget transfers.
config BUSYBOX_FEATURE_WGET_AUTHENTICATION
bool "Enable HTTP authentication"
default y
- depends on BUSYBOX_WGET
+ depends on BUSYBOX_WGET && !ADK_PACKAGE_WGET
help
Support authenticated HTTP transfers.
config BUSYBOX_FEATURE_WGET_LONG_OPTIONS
bool "Enable long options"
default n
- depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS
+ depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS && !ADK_PACKAGE_WGET
help
Support long options for the wget applet.
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index e9234fa..142c6fa 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -5,51 +5,85 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ffmpeg
PKG_VERSION:= 0.6
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= d6142a9a5821d6a6262a6edb903faa24
-PKG_DESCR:= solution to record, convert and stream audio and video
-PKG_SECTION:= multimedia
+PKG_DESCR:= record, convert and stream audio & video
+PKG_SECTION:= libs
PKG_DEPENDS:= libfaad2
-PKG_BUILDDEP+= faad2
-PKG_URL:= http://www.ffmpeg.org
+PKG_BUILDDEP+= faad2 sdl
+PKG_URL:= http://www.ffmpeg.org/
PKG_SITES:= http://www.ffmpeg.org/releases/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_SECTION_FFPLAY:= multimedia
+PKG_DESCR_FFPLAY:= ffmpeg based video player
+PKG_DEPENDS_FFPLAY:= libsdl libpthread ffmpeg
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_FFPLAY},${PKG_DESCR_FFPLAY},${PKG_SECTION_FFPLAY}))
-CONFIG_STYLE:= minimal
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_FFPLAY}+= ffplay-install
+
+ifeq ($(ADK_TARGET),alix1c)
+CONFIGURE_CPU_OPTS:= --disable-ssse3 \
+ --disable-sse \
+ --enable-amd3dnow \
+ --enable-amd3dnowext \
+ --enable-mmx \
+ --enable-mmx2
+else
+CONFIGURE_CPU_OPTS:= --disable-ssse3 \
+ --disable-sse \
+ --disable-amd3dnow \
+ --disable-amd3dnowext \
+ --disable-mmx \
+ --disable-mmx2
+endif
-include ${TOPDIR}/mk/cpu.mk
+# gcc 4.5 produces internal compiler error with -Os
+#TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
+
+CONFIG_STYLE:= minimal
CONFIGURE_ARGS:= --prefix=/usr \
--target-os=linux \
--arch=${CPU_ARCH} \
--enable-cross-compile \
+ --sysroot=${STAGING_DIR} \
--source-path=${WRKSRC} \
--cross-prefix=${TARGET_CROSS} \
--cc=$(TARGET_CC) \
--host-cc=$(HOSTCC) \
--disable-debug \
+ --disable-optimizations \
--disable-stripping \
- --enable-small \
--enable-shared \
--enable-static \
--disable-ffmpeg \
- --disable-ffplay \
--disable-ffserver \
+ --enable-ffplay \
--enable-gpl \
--enable-swscale \
--enable-postproc \
--enable-libfaad \
${CONFIGURE_CPU_OPTS}
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
${INSTALL_DIR} ${IDIR_FFMPEG}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libavdevice.so* ${IDIR_FFMPEG}/usr/lib
${CP} ${WRKINST}/usr/lib/libavformat.so* ${IDIR_FFMPEG}/usr/lib
${CP} ${WRKINST}/usr/lib/libavcodec.so* ${IDIR_FFMPEG}/usr/lib
${CP} ${WRKINST}/usr/lib/libavutil.so* ${IDIR_FFMPEG}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libpostproc.so* ${IDIR_FFMPEG}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libswscale.so* ${IDIR_FFMPEG}/usr/lib
+
+ffplay-install:
+ ${INSTALL_DIR} ${IDIR_FFPLAY}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/ffplay ${IDIR_FFPLAY}/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure
new file mode 100644
index 0000000..d3edea5
--- /dev/null
+++ b/package/ffmpeg/patches/patch-configure
@@ -0,0 +1,11 @@
+--- ffmpeg-0.6.orig/configure 2010-06-15 21:44:30.000000000 +0200
++++ ffmpeg-0.6/configure 2010-07-12 21:34:52.258102064 +0200
+@@ -2640,7 +2640,7 @@ if enabled libdc1394; then
+ die "ERROR: No version of libdc1394 found "
+ fi
+
+-SDL_CONFIG="${cross_prefix}sdl-config"
++SDL_CONFIG="${sysroot}/usr/bin/sdl-config"
+ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+ sdl_cflags=$("${SDL_CONFIG}" --cflags)
+ sdl_libs=$("${SDL_CONFIG}" --libs)
diff --git a/package/mpc/Makefile b/package/mpc/Makefile
new file mode 100644
index 0000000..ef82baa
--- /dev/null
+++ b/package/mpc/Makefile
@@ -0,0 +1,19 @@
+# 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
+include ${TOPDIR}/toolchain/mpc/Makefile.inc
+
+PKG_DESCR:= GNU multiprecision arithmetic library
+PKG_SECTION:= libs
+PKG_URL:= http://www.multiprecision.org/
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LIBMPC,libmpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_LIBMPC}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libmpc.so* ${IDIR_LIBMPC}/usr/lib/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 83e2e39..875f61c 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= mplayer
PKG_VERSION:= 1.0-31648
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= eeb9219f9015e0e0dfbf4a70efefb751
PKG_DESCR:= popular video player
PKG_SECTION:= multimedia
@@ -30,7 +30,10 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIG_STYLE:= manual
+# gcc 4.5 produces internal compiler error with -Os
+#TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
+
+CONFIG_STYLE:= minimal
FAKE_FLAGS+= INSTALLSTRIP=''
@@ -67,70 +70,66 @@ CONFIGURE_CPU_OPTS:= \
endif
ifeq ($(ADK_DEBUG),y)
-CONFIGURE_DEBUG= --enable-debug --enable-crash-debug
+CONFIGURE_DEBUG= --enable-debug
endif
ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
-CONFIGURE_DIRECTFB=--enable-directfb
+CONFIGURE_DIRECTFB= --enable-directfb
else
-CONFIGURE_DIRECTFB=--disable-directfb
+CONFIGURE_DIRECTFB= --disable-directfb
endif
-pre-configure:
- (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
- ./configure \
- --enable-x11 \
- --prefix=/usr \
- --confdir=/etc \
- --enable-cross-compile \
- --target=${ARCH}-linux \
- --cc=$(TARGET_CC) \
- --host-cc=$(HOSTCC) \
- --disable-mencoder \
- --enable-fbdev \
- --enable-alsa \
- --enable-tv \
- --enable-v4l2 \
- --enable-png \
- --enable-jpeg \
- --enable-mad \
- --disable-faad-internal \
- --enable-libvorbis \
- --disable-ossaudio \
- --disable-vm \
- --disable-iconv \
- --disable-lirc \
- --disable-radio-v4l2 \
- --disable-faac \
- --disable-libdv \
- --disable-live \
- --disable-pvr \
- --disable-ftp \
- --disable-ivtv \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-freetype \
- --disable-tremor-internal \
- --disable-arts \
- --disable-esd \
- --disable-jack \
- --disable-openal \
- --disable-nas \
- --disable-sgiaudio \
- --disable-sunaudio \
- --disable-win32waveout \
- --disable-tga \
- --disable-pnm \
- --disable-md5sum \
- --disable-liblzo \
- --disable-xinerama \
- --disable-vidix \
- --disable-gl \
- --extra-cflags="${TCFLAGS} ${EXTRA_CFLAGS}" \
- ${CONFIGURE_CPU_OPTS} \
- ${CONFIGURE_DEBUG} \
- ${CONFIGURE_DIRECTFB} \
- );
+CONFIGURE_ARGS:= --prefix=/usr \
+ --enable-x11 \
+ --confdir=/etc \
+ --enable-cross-compile \
+ --target=${ARCH}-linux \
+ --cc=$(TARGET_CC) \
+ --host-cc=$(HOSTCC) \
+ --disable-mencoder \
+ --enable-fbdev \
+ --enable-alsa \
+ --enable-tv \
+ --enable-v4l2 \
+ --enable-png \
+ --enable-jpeg \
+ --enable-mad \
+ --disable-faad-internal \
+ --enable-libvorbis \
+ --disable-ossaudio \
+ --disable-vm \
+ --disable-iconv \
+ --disable-lirc \
+ --disable-radio-v4l2 \
+ --disable-faac \
+ --disable-libdv \
+ --disable-live \
+ --disable-pvr \
+ --disable-ftp \
+ --disable-ivtv \
+ --disable-dvdread-internal \
+ --disable-libdvdcss-internal \
+ --disable-freetype \
+ --disable-tremor-internal \
+ --disable-arts \
+ --disable-esd \
+ --disable-jack \
+ --disable-openal \
+ --disable-nas \
+ --disable-sgiaudio \
+ --disable-sunaudio \
+ --disable-win32waveout \
+ --disable-tga \
+ --disable-pnm \
+ --disable-md5sum \
+ --disable-liblzo \
+ --disable-xinerama \
+ --disable-vidix \
+ --disable-gl \
+ --extra-cflags="${TCFLAGS} ${EXTRA_CFLAGS}" \
+ ${CONFIGURE_CPU_OPTS} \
+ ${CONFIGURE_DEBUG} \
+ ${CONFIGURE_DIRECTFB}
post-install:
${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index c0cce10..033ffeb 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -4,14 +4,14 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mysql
-PKG_VERSION:= 5.1.41
+PKG_VERSION:= 5.1.48
PKG_RELEASE:= 1
-PKG_MD5SUM:= b5d39e8789174753f3c782959729e68c
+PKG_MD5SUM:= d04c54d1cfbd8c6c8650c8d078f885b2
PKG_DESCR:= MySQL client library
PKG_SECTION:= db
PKG_DEPENDS:= libncurses zlib
PKG_BUILDDEP+= ncurses zlib readline
-PKG_URL:= http://www.mysql.com
+PKG_URL:= http://www.mysql.com/
PKG_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.1/}
PKG_HOST_DEPENDS:= !cygwin
diff --git a/package/mysql/patches/patch-Makefile_in b/package/mysql/patches/patch-Makefile_in
new file mode 100644
index 0000000..3606a31
--- /dev/null
+++ b/package/mysql/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- mysql-5.1.48.orig/Makefile.in 2010-06-03 17:54:43.000000000 +0200
++++ mysql-5.1.48/Makefile.in 2010-07-13 12:29:09.025919648 +0200
+@@ -1134,7 +1134,7 @@ abi_check_all: $(TEST_PREPROCESSOR_HEADE
+ do_abi_check:
+ set -ex; \
+ for file in $(abi_headers); do \
+- @CC@ -E -nostdinc -dI \
++ @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/include/mysql \
+ -I$(top_srcdir)/sql \
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index 0ce1eac..1c61d1a 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,6 +1,6 @@
---- mysql-5.1.41.orig/configure Wed Nov 4 19:37:28 2009
-+++ mysql-5.1.41/configure Tue Dec 29 13:28:43 2009
-@@ -46976,198 +46976,15 @@ $as_echo "$as_me: error: unknown endianness
+--- mysql-5.1.48.orig/configure 2010-06-03 17:54:47.000000000 +0200
++++ mysql-5.1.48/configure 2010-07-12 22:51:24.267118950 +0200
+@@ -48273,197 +48273,14 @@ $as_echo "$as_me: error: unknown endiann
esac
@@ -177,7 +177,7 @@
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
+-
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
@@ -195,15 +195,13 @@
-fi
-
-
--
+
{ $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
$as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
- # either define HAVE_IB_SOLARIS_ATOMICS or not
-@@ -47283,101 +47100,6 @@ _ACEOF
- fi
+@@ -48581,101 +48398,6 @@ fi
done
--
+
- { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5
-$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; }
- # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
@@ -298,6 +296,7 @@
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
+-
-
+ # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
diff --git a/package/mysql/patches/patch-include_config_h_in b/package/mysql/patches/patch-include_config_h_in
new file mode 100644
index 0000000..8c39a7c
--- /dev/null
+++ b/package/mysql/patches/patch-include_config_h_in
@@ -0,0 +1,21 @@
+--- mysql-5.1.48.orig/include/config.h.in 2010-06-03 17:54:04.000000000 +0200
++++ mysql-5.1.48/include/config.h.in 2010-07-12 22:52:37.985862985 +0200
+@@ -856,7 +856,7 @@
+ /* Define to 1 if you have the `strtoull' function. */
+ #undef HAVE_STRTOULL
+
+-/* Define to 1 if `st_rdev' is member of `struct stat'. */
++/* Define to 1 if `struct stat' is a member of `st_rdev'. */
+ #undef HAVE_STRUCT_STAT_ST_RDEV
+
+ /* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
+@@ -1151,6 +1151,9 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
index 2b262bb..847554a 100644
--- a/package/mysql/patches/patch-include_my_global_h
+++ b/package/mysql/patches/patch-include_my_global_h
@@ -1,5 +1,5 @@
---- mysql-5.1.41.orig/include/my_global.h Wed Nov 4 19:28:15 2009
-+++ mysql-5.1.41/include/my_global.h Tue Dec 29 13:39:20 2009
+--- mysql-5.1.48.orig/include/my_global.h 2010-06-03 17:50:27.000000000 +0200
++++ mysql-5.1.48/include/my_global.h 2010-07-12 22:51:23.369609493 +0200
@@ -18,6 +18,8 @@
#ifndef _global_h
#define _global_h
@@ -9,7 +9,7 @@
/*
InnoDB depends on some MySQL internals which other plugins should not
need. This is because of InnoDB's foreign key support, "safe" binlog
-@@ -424,7 +426,7 @@ C_MODE_END
+@@ -428,7 +430,7 @@ C_MODE_END
#ifdef HAVE_FLOAT_H
#include <float.h>
#endif
@@ -18,7 +18,7 @@
#include <fenv.h> /* For fesetround() */
#endif
-@@ -454,15 +456,20 @@ C_MODE_END
+@@ -458,15 +460,20 @@ C_MODE_END
#undef HAVE_ALLOCA
#undef HAVE_ALLOCA_H
#endif
@@ -40,7 +40,7 @@
/*
A lot of our programs uses asserts, so better to always include it
-@@ -879,9 +886,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
+@@ -883,9 +890,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
#endif /* HAVE_FINITE */
#endif /* isfinite */
diff --git a/package/mysql/patches/patch-include_mysql_h b/package/mysql/patches/patch-include_mysql_h
new file mode 100644
index 0000000..3d97d4a
--- /dev/null
+++ b/package/mysql/patches/patch-include_mysql_h
@@ -0,0 +1,12 @@
+--- mysql-5.1.48.orig/include/mysql.h 2010-06-03 17:50:21.000000000 +0200
++++ mysql-5.1.48/include/mysql.h 2010-07-13 12:29:46.006089563 +0200
+@@ -44,7 +44,9 @@ extern "C" {
+ #endif
+
+ #ifndef _global_h /* If not standard header */
++#ifndef MYSQL_ABI_CHECK
+ #include <sys/types.h>
++#endif
+ #ifdef __LCC__
+ #include <winsock2.h> /* For windows */
+ #endif
diff --git a/package/mysql/patches/patch-include_mysql_h_pp b/package/mysql/patches/patch-include_mysql_h_pp
new file mode 100644
index 0000000..86e6437
--- /dev/null
+++ b/package/mysql/patches/patch-include_mysql_h_pp
@@ -0,0 +1,7 @@
+--- mysql-5.1.48.orig/include/mysql.h.pp 2010-06-03 17:50:12.000000000 +0200
++++ mysql-5.1.48/include/mysql.h.pp 2010-07-13 12:30:01.375881071 +0200
+@@ -1,4 +1,3 @@
+-#include <sys/types.h>
+ typedef char my_bool;
+ typedef int my_socket;
+ #include "mysql_version.h"
diff --git a/package/mysql/patches/patch-sql_sql_builtin_cc b/package/mysql/patches/patch-sql_sql_builtin_cc
new file mode 100644
index 0000000..785ae00
--- /dev/null
+++ b/package/mysql/patches/patch-sql_sql_builtin_cc
@@ -0,0 +1,15 @@
+--- mysql-5.1.48.orig/sql/sql_builtin.cc 2010-06-03 17:57:58.000000000 +0200
++++ mysql-5.1.48/sql/sql_builtin.cc 2010-07-12 22:52:33.577118523 +0200
+@@ -18,10 +18,10 @@
+ typedef struct st_mysql_plugin builtin_plugin[];
+
+ extern builtin_plugin
+- builtin_binlog_plugin, builtin_partition_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin, builtin_ndbcluster_plugin;
++ builtin_binlog_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin;
+
+ struct st_mysql_plugin *mysqld_builtins[]=
+ {
+- builtin_binlog_plugin, builtin_partition_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin, builtin_ndbcluster_plugin,(struct st_mysql_plugin *)0
++ builtin_binlog_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin,(struct st_mysql_plugin *)0
+ };
+
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 0f9a9de..ca77c56 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -18,6 +18,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS+= -liconv
CONFIGURE_ARGS+= --with-debug=0 \
--disable-perl \
--disable-python \
diff --git a/package/xf86-video-siliconmotion/patches/xf86-video-siliconmotion-1.7.3-fix-loongson.patch b/package/xf86-video-siliconmotion/patches/xf86-video-siliconmotion-1.7.3-fix-loongson.patch
deleted file mode 100644
index b94ca6d..0000000
--- a/package/xf86-video-siliconmotion/patches/xf86-video-siliconmotion-1.7.3-fix-loongson.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -ur orig/src/smi_video.c mod/src/smi_video.c
---- xf86-video-siliconmotion-1.7.3.orig/src/smi_video.c 2009-07-27 05:42:44.000000000 +0200
-+++ xf86-video-siliconmotion-1.7.3/src/smi_video.c 2010-06-03 16:55:59.169793245 +0200
-@@ -276,6 +276,7 @@ static XF86ImageRec SMI_VideoImages[] =
- XVIMAGE_YUY2,
- XVIMAGE_YV12,
- XVIMAGE_I420,
-+ XVIMAGE_UYVY,
- {
- FOURCC_RV15, /* id */
- XvRGB, /* type */
-@@ -1103,7 +1104,7 @@ SMI_PutVideo(
- vpr00 |= 0x0010000E;
- } else {
- /*
-- Bit 21 = 10: Vertical Interpolation = enabled
-+ Bit 21 = 1: Vertical Interpolation = enabled
- Bit 24 = 1: Select Video Window I Source Addr = 1
- 1= Video window I source addr = capture port buffer ?
- */
-@@ -1464,6 +1465,117 @@ SMI_QueryBestSize(
- LEAVE();
- }
-
-+static void myXVCopyYUV12ToPacked(const unsigned char *srcy, const unsigned char *srcv, const unsigned char *srcu,
-+ unsigned char *dst, int srcPitchy, int srcPitchuv, int dstPitch, int h, int w)
-+{
-+ int i, j;
-+ unsigned char const *y, *u, *v;
-+ int dstinc, yinc, uinc, vinc;
-+
-+ y = srcy;
-+ u = srcu;
-+ v = srcv;
-+
-+ dstinc = dstPitch - 2*w;
-+ yinc = srcPitchy - w;
-+ uinc = srcPitchuv - w/2;
-+ vinc = srcPitchuv - w/2;
-+
-+ for (i = 0; i < h; i++) {
-+ asm (
-+// ".set arch=loongson2f\n\t"
-+ ".set noreorder\n\t"
-+ "move $8, %8 \n\t"
-+ "1: \n\t"
-+ "beqz $8, 2f \n\t"
-+ "xor $f0, $f0, $f0 \n\t"
-+ "ldc1 $f4, (%0) \n\t"
-+ "punpcklbh $f2, $f4, $f0 \n\t"
-+ "punpckhbh $f4, $f4, $f0 \n\t"
-+ "ldc1 $f16, 8(%0) \n\t"
-+ "punpcklbh $f14, $f16, $f0 \n\t"
-+ "punpckhbh $f16, $f16, $f0 \n\t"
-+
-+ "lwc1 $f8, (%1) \n\t"
-+ "lwc1 $f12, (%2) \n\t"
-+ "punpcklbh $f8, $f8, $f12 \n\t"
-+ "punpcklbh $f6, $f0, $f8 \n\t"
-+ "punpckhbh $f8, $f0, $f8 \n\t"
-+ "lwc1 $f18, 4(%1) \n\t"
-+ "lwc1 $f12, 4(%2) \n\t"
-+ "punpcklbh $f18, $f18, $f12 \n\t"
-+ "punpcklbh $f10, $f0, $f18 \n\t"
-+ "punpckhbh $f12, $f0, $f18 \n\t"
-+
-+ "or $f2, $f2, $f6 \n\t"
-+ "or $f4, $f4, $f8 \n\t"
-+ "or $f14, $f14, $f10 \n\t"
-+ "or $f16, $f16, $f12 \n\t"
-+
-+ "sdc1 $f2, (%3) \n\t"
-+ "sdc1 $f4, 8(%3) \n\t"
-+ "add %0, 16 \n\t"
-+ "add %1, 8 \n\t"
-+ "add %2, 8 \n\t"
-+ "sdc1 $f14, 0x10(%3) \n\t"
-+ "sdc1 $f16, 0x18(%3) \n\t"
-+ "add $8, -1 \n\t"
-+ "b 1b \n\t"
-+ "add %3, 32 \n\t"
-+ "2: \n\t"
-+ ".set reorder\n\t"
-+ : "=r" (y), "=r" (u), "=r" (v), "=r" (dst)
-+ : "0" (y), "1" (u), "2" (v), "3" (dst), "r" (w>>4)
-+ : "memory","$8"
-+ );
-+
-+ asm (
-+// ".set arch=loongson2f\n\t"
-+ ".set noreorder\n\t"
-+ "move $8, %8 \n\t"
-+ "1: \n\t"
-+ "beqz $8, 2f \n\t"
-+ "xor $f0, $f0, $f0 \n\t"
-+ "ldc1 $f4, (%0) \n\t"
-+ "punpcklbh $f2, $f4, $f0 \n\t"
-+ "punpckhbh $f4, $f4, $f0 \n\t"
-+
-+ "lwc1 $f8, (%1) \n\t"
-+ "lwc1 $f12, (%2) \n\t"
-+ "punpcklbh $f8, $f8, $f12 \n\t"
-+ "punpcklbh $f6, $f0, $f8 \n\t"
-+ "punpckhbh $f8, $f0, $f8 \n\t"
-+
-+ "or $f2, $f2, $f6 \n\t"
-+ "or $f4, $f4, $f8 \n\t"
-+
-+ "sdc1 $f2, (%3) \n\t"
-+ "sdc1 $f4, 8(%3) \n\t"
-+ "add %0, 8 \n\t"
-+ "add %1, 4 \n\t"
-+ "add %2, 4 \n\t"
-+ "add $8, -1 \n\t"
-+ "b 1b \n\t"
-+ "add %3, 16 \n\t"
-+ "2:\n\t"
-+ ".set reorder\n\t"
-+ : "=r" (y), "=r" (u), "=r" (v), "=r" (dst)
-+ : "0" (y), "1" (u), "2" (v), "3" (dst), "r" ((w&0xf)/8)
-+ : "memory","$8"
-+ );
-+
-+ for (j = (w&7)/2; j; j--) {
-+ *dst++ = *y++;
-+ *dst++ = *u++;
-+ *dst++ = *y++;
-+ *dst++ = *v++;
-+ }
-+ y += yinc;
-+ u = (i%2) ? (u + uinc): (u - w/2);
-+ v = (i%2) ? (v + vinc): (v - w/2);
-+ dst += dstinc;
-+ }
-+}
-
- static int
- SMI_PutImage(
-@@ -1592,7 +1704,7 @@ SMI_PutImage(
- offset3 = tmp;
- }
- nLines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
-- xf86XVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1),
-+ myXVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1),
- buf + offset2, buf + offset3, dstStart,
- srcPitch, srcPitch2, dstPitch, nLines,
- nPixels);
-@@ -1747,7 +1859,7 @@ SMI_DisplayVideo(
- {
- SMIPtr pSmi = SMIPTR(pScrn);
- CARD32 vpr00;
-- int hstretch, vstretch;
-+ uint_least32_t hstretch, vstretch;
-
- ENTER();
-
-@@ -1774,13 +1886,13 @@ SMI_DisplayVideo(
- }
-
- if (drw_w > vid_w) {
-- hstretch = (2560 * vid_w / drw_w + 5) / 10;
-+ hstretch = ((uint_least32_t)(vid_w - 1) << 16) / (drw_w - 1);
- } else {
- hstretch = 0;
- }
-
- if (drw_h > vid_h) {
-- vstretch = (2560 * vid_h / drw_h + 5) / 10;
-+ vstretch = ((uint_least32_t)(vid_h - 1) << 16) / (drw_h - 1);
- vpr00 |= 1 << 21;
- } else {
- vstretch = 0;
-@@ -1791,7 +1903,8 @@ SMI_DisplayVideo(
- WRITE_VPR(pSmi, 0x18, (dstBox->x2) | (dstBox->y2 << 16));
- WRITE_VPR(pSmi, 0x1C, offset >> 3);
- WRITE_VPR(pSmi, 0x20, (pitch >> 3) | ((pitch >> 3) << 16));
-- WRITE_VPR(pSmi, 0x24, (hstretch << 8) | vstretch);
-+ WRITE_VPR(pSmi, 0x24, (hstretch & 0xff00) | ((vstretch & 0xff00) >> 8));
-+ WRITE_VPR(pSmi, 0x68, ((hstretch & 0xff) << 8) | (vstretch & 0xff));
-
- LEAVE();
- }
diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile
index 90b8190..280b982 100644
--- a/package/xtrans/Makefile
+++ b/package/xtrans/Makefile
@@ -7,14 +7,10 @@ PKG_NAME:= xtrans
PKG_VERSION:= 1.2.5
PKG_RELEASE:= 1
PKG_MD5SUM:= b2f47d49faf1f24e8294b624b21b9b93
-PKG_DESCR:= X transport library
-PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XTRANS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
CONFIGURE_ARGS+= --datadir=/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk