summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/hicolor-icon-theme/Makefile24
-rw-r--r--package/libgd/patches/patch-config_hin12
-rw-r--r--package/libgd/patches/patch-config_ltmain_sh11
-rw-r--r--package/libnfsidmap/patches/patch-ltmain_sh11
-rw-r--r--package/libpri/patches/patch-Makefile8
-rw-r--r--package/libpthread/Makefile3
-rw-r--r--package/libxcb/Makefile2
-rw-r--r--package/links/patches/patch-png_c38
-rw-r--r--package/mplayer/Makefile12
-rw-r--r--package/mplayer/patches/patch-Makefile10
-rw-r--r--package/mplayer/patches/patch-configure6
-rw-r--r--package/mplayer/patches/patch-libmpcodecs_vd_mpng_c39
-rw-r--r--package/php/Makefile23
-rw-r--r--package/php/patches/patch-ext_standard_php_crypt_r_c11
-rw-r--r--package/sdl-image/patches/patch-IMG_png_c160
-rw-r--r--package/section.lst3
-rw-r--r--package/snort/Makefile14
-rw-r--r--package/uclibc/Makefile6
-rw-r--r--package/xcb-proto/Makefile5
-rw-r--r--package/xfsprogs/patches/patch-ltmain_sh11
21 files changed, 359 insertions, 52 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index c5df7bce4..143047b05 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/apps
PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify libpng
PKG_DEPENDS+= nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf
-PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11
+PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 MesaLib
PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme
PKG_URL:= http://www.mozilla.org/
PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
diff --git a/package/hicolor-icon-theme/Makefile b/package/hicolor-icon-theme/Makefile
new file mode 100644
index 000000000..8a8c7f658
--- /dev/null
+++ b/package/hicolor-icon-theme/Makefile
@@ -0,0 +1,24 @@
+# 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:= hicolor-icon-theme
+PKG_VERSION:= 0.12
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 55cafbcef8bcf7107f6d502149eb4d87
+PKG_DESCR:= Hicolor Icon Theme
+PKG_SECTION:= x11/misc
+PKG_URL:= http://icon-theme.freedesktop.org/
+PKG_SITES:= http://icon-theme.freedesktop.org/releases/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,HICOLOR_ICON_THEME,hicolor-icon-theme,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+hicolor-icon-theme-install:
+ $(INSTALL_DIR) $(IDIR_HICOLOR_ICON_THEME)/usr/share/icons
+ $(CP) $(WRKINST)/usr/share/icons/* \
+ $(IDIR_HICOLOR_ICON_THEME)/usr/share/icons
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgd/patches/patch-config_hin b/package/libgd/patches/patch-config_hin
new file mode 100644
index 000000000..e5752c060
--- /dev/null
+++ b/package/libgd/patches/patch-config_hin
@@ -0,0 +1,12 @@
+--- gd-2.0.35.orig/config.hin 2006-10-09 16:22:22.000000000 +0200
++++ gd-2.0.35/config.hin 2011-04-01 13:40:40.551811181 +0200
+@@ -99,6 +99,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/libgd/patches/patch-config_ltmain_sh b/package/libgd/patches/patch-config_ltmain_sh
new file mode 100644
index 000000000..9e40639f8
--- /dev/null
+++ b/package/libgd/patches/patch-config_ltmain_sh
@@ -0,0 +1,11 @@
+--- gd-2.0.35.orig/config/ltmain.sh 2006-10-09 16:22:22.000000000 +0200
++++ gd-2.0.35/config/ltmain.sh 2011-04-01 14:15:35.561818573 +0200
+@@ -1671,7 +1671,7 @@ EOF
+ # -pg pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+- -t[45]*|-txscale*|@*)
++ -t[45]*|-txscale*|@*|-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/libnfsidmap/patches/patch-ltmain_sh b/package/libnfsidmap/patches/patch-ltmain_sh
new file mode 100644
index 000000000..9f0a7c0d7
--- /dev/null
+++ b/package/libnfsidmap/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- libnfsidmap-0.24.orig/ltmain.sh 2010-12-08 19:02:47.000000000 +0100
++++ libnfsidmap-0.24/ltmain.sh 2011-04-01 14:32:08.651808966 +0200
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
diff --git a/package/libpri/patches/patch-Makefile b/package/libpri/patches/patch-Makefile
index 743924088..811ef59a9 100644
--- a/package/libpri/patches/patch-Makefile
+++ b/package/libpri/patches/patch-Makefile
@@ -1,5 +1,5 @@
--- libpri-1.4.10.2.orig/Makefile 2008-08-06 20:20:51.000000000 +0200
-+++ libpri-1.4.10.2/Makefile 2011-01-21 14:32:08.278658337 +0100
++++ libpri-1.4.10.2/Makefile 2011-04-01 14:39:42.851818751 +0200
@@ -31,8 +31,8 @@ CC=gcc
GREP=grep
AWK=awk
@@ -30,11 +30,13 @@
%.lo: %.c
$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
-@@ -146,7 +147,6 @@ $(STATIC_LIBRARY): $(STATIC_OBJS)
+@@ -145,8 +146,7 @@ $(STATIC_LIBRARY): $(STATIC_OBJS)
+ ranlib $(STATIC_LIBRARY)
$(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
- $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
+- $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
- $(LDCONFIG) $(LDCONFIG_FLAGS) .
++ $(CC) -shared $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
ln -sf libpri.so.$(SONAME) libpri.so
version.c: FORCE
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index f91be0dc7..4d61d570a 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -25,6 +25,7 @@ PKG_OPTS:= noremove
NO_DISTFILES:= 1
PKG_SUBPKGS:= LIBPTHREAD LIBPTHREAD_DEV
+PKGSC_LIBPTHREAD_DEV:= devel
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libonly
@@ -33,7 +34,7 @@ endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBPTHREAD_DEV,libpthread-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBPTHREAD_DEV,libpthread-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBPTHREAD_DEV},${PKG_OPTS}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index 0bf4b9afb..cf292f384 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ENV+= PYTHON=$(PYTHON)
libxcb-install:
${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib
libxcb-dev-install:
${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/include
diff --git a/package/links/patches/patch-png_c b/package/links/patches/patch-png_c
new file mode 100644
index 000000000..ff067ba86
--- /dev/null
+++ b/package/links/patches/patch-png_c
@@ -0,0 +1,38 @@
+--- links-2.2.orig/png.c 2005-01-02 20:03:34.000000000 +0100
++++ links-2.2/png.c 2011-04-01 15:01:25.801818815 +0200
+@@ -48,7 +48,7 @@ void img_my_png_warning(png_structp a, p
+ /* Error for from-web PNG images. */
+ void img_my_png_error(png_structp png_ptr, png_const_charp error_string)
+ {
+- longjmp(png_ptr->jmpbuf,1);
++ longjmp(png_jmpbuf(png_ptr),1);
+ }
+
+ void png_info_callback(png_structp png_ptr, png_infop info_ptr)
+@@ -203,7 +203,7 @@ void png_start(struct cached_image *cimg
+ #ifdef DEBUG
+ if (!info_ptr) internal ("png_create_info_struct failed\n");
+ #endif /* #ifdef DEBUG */
+- if (setjmp(png_ptr->jmpbuf)){
++ if (setjmp(png_jmpbuf(png_ptr))){
+ error:
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ (png_infopp)NULL);
+@@ -213,7 +213,7 @@ error:
+ png_set_progressive_read_fn(png_ptr, NULL,
+ png_info_callback, png_row_callback,
+ png_end_callback);
+- if (setjmp(png_ptr->jmpbuf)) goto error;
++ if (setjmp(png_jmpbuf(png_ptr))) goto error;
+ decoder=mem_alloc(sizeof(*decoder));
+ decoder->png_ptr=png_ptr;
+ decoder->info_ptr=info_ptr;
+@@ -232,7 +232,7 @@ void png_restart(struct cached_image *ci
+ png_ptr=((struct png_decoder *)(cimg->decoder))->png_ptr;
+ info_ptr=((struct png_decoder *)(cimg->decoder))->info_ptr;
+ end_callback_hit=0;
+- if (setjmp(png_ptr->jmpbuf)){
++ if (setjmp(png_jmpbuf(png_ptr))){
+ img_end(cimg);
+ return;
+ }
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 7ccde9e74..3b08057da 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mplayer
-PKG_VERSION:= 1.0-32749
-PKG_RELEASE:= 2
-PKG_MD5SUM:= aadc5d8cca503c8b18b3ed00b3a52cf5
+PKG_VERSION:= 1.0rc4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 1699c94de39da9c4c5d34e8f58e418f0
PKG_DESCR:= popular video player
PKG_SECTION:= multimedia
PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses
@@ -15,7 +15,11 @@ PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib
PKG_BUILDDEP:= alsa-lib libmad libvorbis faad2 ncurses zlib
PKG_BUILDDEP+= libX11 libXv libpng libXext
PKG_URL:= http://www.mplayerhq.hu/
-PKG_SITES:= http://openadk.org/distfiles/
+#PKG_SITES:= http://openadk.org/distfiles/
+PKG_SITES:= http://www.mplayerhq.hu/MPlayer/releases/
+
+DISTFILES:= MPlayer-$(PKG_VERSION).tar.bz2
+WRKDIST= ${WRKDIR}/MPlayer-$(PKG_VERSION)
PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el
diff --git a/package/mplayer/patches/patch-Makefile b/package/mplayer/patches/patch-Makefile
index 3f57255db..9c8e32783 100644
--- a/package/mplayer/patches/patch-Makefile
+++ b/package/mplayer/patches/patch-Makefile
@@ -1,11 +1,11 @@
---- mplayer-1.0-32749.orig/Makefile 2011-01-03 11:27:11.000000000 +0100
-+++ mplayer-1.0-32749/Makefile 2011-02-05 18:20:49.000000000 +0100
-@@ -816,7 +816,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+--- MPlayer-1.0rc4.orig/Makefile 2010-07-29 19:08:19.000000000 +0200
++++ MPlayer-1.0rc4/Makefile 2011-04-01 16:14:58.571818417 +0200
+@@ -851,7 +851,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
-- $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
-+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
+- $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
++ $(CC_FOR_BUILD) -O -DCODECS2HTML -I. -o $@ $<
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./$^ > $@
diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure
index eb33a8720..2fe0e1e10 100644
--- a/package/mplayer/patches/patch-configure
+++ b/package/mplayer/patches/patch-configure
@@ -1,6 +1,6 @@
---- mplayer-1.0-32749.orig/configure 2011-01-03 11:27:11.000000000 +0100
-+++ mplayer-1.0-32749/configure 2011-01-09 00:35:20.000000000 +0100
-@@ -2554,7 +2554,7 @@ else
+--- MPlayer-1.0rc4.orig/configure 2010-07-29 02:31:57.000000000 +0200
++++ MPlayer-1.0rc4/configure 2011-04-01 16:12:17.224319163 +0200
+@@ -2556,7 +2556,7 @@ else
fi
cflag_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer"
diff --git a/package/mplayer/patches/patch-libmpcodecs_vd_mpng_c b/package/mplayer/patches/patch-libmpcodecs_vd_mpng_c
new file mode 100644
index 000000000..c783ec100
--- /dev/null
+++ b/package/mplayer/patches/patch-libmpcodecs_vd_mpng_c
@@ -0,0 +1,39 @@
+--- MPlayer-1.0rc4.orig/libmpcodecs/vd_mpng.c 2010-02-26 16:01:37.000000000 +0100
++++ MPlayer-1.0rc4/libmpcodecs/vd_mpng.c 2011-04-01 16:23:04.381818599 +0200
+@@ -74,7 +74,7 @@ static int pngLength;
+
+ static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size )
+ {
+- char * p = pngstr->io_ptr;
++ char * p = png_get_io_ptr(pngstr);
+ if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer;
+ fast_memcpy( buffer,(char *)&p[pngPointer],size );
+ pngPointer+=size;
+@@ -90,6 +90,7 @@ static mp_image_t* decode(sh_video_t *sh
+ png_uint_32 png_width=0,png_height=0;
+ int depth,color;
+ png_uint_32 i;
++ png_byte color_type;
+ mp_image_t* mpi;
+
+ int cols;
+@@ -111,7 +112,9 @@ static mp_image_t* decode(sh_video_t *sh
+ png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL );
+ png_set_bgr( png );
+
+- switch( info->color_type ) {
++ color_type=png_get_color_type(png, info);
++
++ switch( color_type ) {
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
+ mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry gray scaled png with alpha channel not supported at moment.\n" );
+ break;
+@@ -128,7 +131,7 @@ static mp_image_t* decode(sh_video_t *sh
+ out_fmt=IMGFMT_BGR24;
+ break;
+ default:
+- mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,info->color_type);
++ mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,color_type);
+ }
+
+ // (re)init libvo if image parameters changed (width/height/colorspace)
diff --git a/package/php/Makefile b/package/php/Makefile
index 14e037a30..04167069a 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= php
-PKG_VERSION:= 5.3.5
+PKG_VERSION:= 5.3.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= fb727a3ac72bf0ce37e1a20468a7bb81
+PKG_MD5SUM:= 88a2b00047bc53afbbbdf10ebe28a57e
PKG_DESCR:= PHP language interpreter
PKG_SECTION:= lang
PKG_DEPENDS:= libopenssl zlib
@@ -19,15 +19,16 @@ PKG_SUBPKGS:= PHP PHP_CLI PHP_FASTCGI
PKGSD_PHP_FASTCGI:= PHP for FastCGI usage
PKGSD_PHP_CLI:= PHP CLI
-PKG_FLAVOURS_PHP:= MOD_CURL MOD_GD MOD_GMP MOD_LDAP MOD_MYSQL
+#PKG_FLAVOURS_PHP:= MOD_CURL MOD_GD MOD_GMP MOD_LDAP MOD_MYSQL
+PKG_FLAVOURS_PHP:= MOD_CURL MOD_GMP MOD_LDAP MOD_MYSQL
PKG_FLAVOURS_PHP+= MOD_PGSQL MOD_SQLITE MOD_XML
PKGFD_MOD_CURL:= Curl support
PKGFB_MOD_CURL:= curl
PKGFS_MOD_CURL:= libcurl
-PKGFD_MOD_GD:= Gd support
-PKGFB_MOD_GD:= libgd libpng
-PKGFS_MOD_GD:= libgd libpng
+#PKGFD_MOD_GD:= Gd support
+#PKGFB_MOD_GD:= libgd libpng
+#PKGFS_MOD_GD:= libgd libpng
PKGFD_MOD_GMP:= GMP support
PKGFB_MOD_GMP:= gmp
PKGFS_MOD_GMP:= libgmp
@@ -106,9 +107,9 @@ PKG_CONFIGURE_OPTS+= --with-curl=shared,"$(STAGING_TARGET_DIR)/usr"
else
PKG_CONFIGURE_OPTS+= --without-curl
endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_GD),)
-PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \
- --with-jpeg-dir="$(STAGING_TARGET_DIR)/usr" \
+#ifneq ($(ADK_PACKAGE_PHP_MOD_GD),)
+#PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \
+ --without-jpeg-dir \
--with-png-dir="$(STAGING_TARGET_DIR)/usr" \
--without-freetype-dir \
--without-xpm-dir \
@@ -116,9 +117,9 @@ PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \
--without-t1lib \
--enable-gd-native-ttf \
--disable-gd-jis-conv
-else
+#else
PKG_CONFIGURE_OPTS+= --without-gd
-endif
+#endif
ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),)
PKG_CONFIGURE_OPTS+= --with-gmp=shared,"$(STAGING_TARGET_DIR)/usr"
else
diff --git a/package/php/patches/patch-ext_standard_php_crypt_r_c b/package/php/patches/patch-ext_standard_php_crypt_r_c
deleted file mode 100644
index 1c47df417..000000000
--- a/package/php/patches/patch-ext_standard_php_crypt_r_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- php-5.3.4.orig/ext/standard/php_crypt_r.c 2010-06-17 12:22:03.000000000 +0200
-+++ php-5.3.4/ext/standard/php_crypt_r.c 2010-12-30 12:53:12.000000000 +0100
-@@ -94,7 +94,7 @@ void _crypt_extended_init_r(void)
- if (!initialized) {
- #ifdef PHP_WIN32
- InterlockedIncrement(&initialized);
--#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR >= 2))
-+#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR >= 2)) || defined(__UCLIBC__)
- __sync_fetch_and_add(&initialized, 1);
- #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */
- membar_producer();
diff --git a/package/sdl-image/patches/patch-IMG_png_c b/package/sdl-image/patches/patch-IMG_png_c
new file mode 100644
index 000000000..315c1f676
--- /dev/null
+++ b/package/sdl-image/patches/patch-IMG_png_c
@@ -0,0 +1,160 @@
+--- SDL_image-1.2.10.orig/IMG_png.c 2009-11-08 11:55:32.000000000 +0100
++++ SDL_image-1.2.10/IMG_png.c 2011-04-01 20:26:38.981819248 +0200
+@@ -71,6 +71,10 @@
+ #endif
+ #include <png.h>
+
++/* Check for the older version of libpng */
++#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4)
++#define LIBPNG_VERSION_12
++#endif
+
+ static struct {
+ int loaded;
+@@ -80,6 +84,8 @@ static struct {
+ void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr);
+ png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method);
+ png_voidp (*png_get_io_ptr) (png_structp png_ptr);
++ png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr);
++ png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette);
+ png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values);
+ png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag);
+ void (*png_read_image) (png_structp png_ptr, png_bytepp image);
+@@ -91,6 +97,9 @@ static struct {
+ void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn);
+ void (*png_set_strip_16) (png_structp png_ptr);
+ int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check);
++#ifndef LIBPNG_VERSION_12
++ jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t);
++#endif
+ } lib;
+
+ #ifdef LOAD_PNG_DYNAMIC
+@@ -129,6 +138,13 @@ int IMG_InitPNG()
+ SDL_UnloadObject(lib.handle);
+ return -1;
+ }
++ lib.png_get_channels =
++ (png_byte (*) (png_structp, png_infop))
++ SDL_LoadFunction(lib.handle, "png_get_channels");
++ if ( lib.png_get_channels == NULL ) {
++ SDL_UnloadObject(lib.handle);
++ return -1;
++ }
+ lib.png_get_io_ptr =
+ (png_voidp (*) (png_structp))
+ SDL_LoadFunction(lib.handle, "png_get_io_ptr");
+@@ -136,6 +152,13 @@ int IMG_InitPNG()
+ SDL_UnloadObject(lib.handle);
+ return -1;
+ }
++ lib.png_get_PLTE =
++ (png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *))
++ SDL_LoadFunction(lib.handle, "png_get_PLTE");
++ if ( lib.png_get_PLTE == NULL ) {
++ SDL_UnloadObject(lib.handle);
++ return -1;
++ }
+ lib.png_get_tRNS =
+ (png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *))
+ SDL_LoadFunction(lib.handle, "png_get_tRNS");
+@@ -213,6 +236,15 @@ int IMG_InitPNG()
+ SDL_UnloadObject(lib.handle);
+ return -1;
+ }
++#ifndef LIBPNG_VERSION_12
++ lib.png_set_longjmp_fn =
++ (jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t))
++ SDL_LoadFunction(lib.handle, "png_set_longjmp_fn");
++ if ( lib.png_set_longjmp_fn == NULL ) {
++ SDL_UnloadObject(lib.handle);
++ return -1;
++ }
++#endif
+ }
+ ++lib.loaded;
+
+@@ -236,7 +268,9 @@ int IMG_InitPNG()
+ lib.png_create_read_struct = png_create_read_struct;
+ lib.png_destroy_read_struct = png_destroy_read_struct;
+ lib.png_get_IHDR = png_get_IHDR;
++ lib.png_get_channels = png_get_channels;
+ lib.png_get_io_ptr = png_get_io_ptr;
++ lib.png_get_PLTE = png_get_PLTE;
+ lib.png_get_tRNS = png_get_tRNS;
+ lib.png_get_valid = png_get_valid;
+ lib.png_read_image = png_read_image;
+@@ -248,6 +282,9 @@ int IMG_InitPNG()
+ lib.png_set_read_fn = png_set_read_fn;
+ lib.png_set_strip_16 = png_set_strip_16;
+ lib.png_sig_cmp = png_sig_cmp;
++#ifndef LIBPNG_VERSION_12
++ lib.png_set_longjmp_fn = png_set_longjmp_fn;
++#endif
+ }
+ ++lib.loaded;
+
+@@ -347,7 +384,12 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in png_create_read_struct() earlier.
+ */
+- if ( setjmp(png_ptr->jmpbuf) ) {
++#ifndef LIBPNG_VERSION_12
++ if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) )
++#else
++ if ( setjmp(png_ptr->jmpbuf) )
++#endif
++ {
+ error = "Error reading the PNG file.";
+ goto done;
+ }
+@@ -416,9 +458,9 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s
+ Rmask = 0x000000FF;
+ Gmask = 0x0000FF00;
+ Bmask = 0x00FF0000;
+- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++ Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
+ } else {
+- int s = (info_ptr->channels == 4) ? 0 : 8;
++ int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ Rmask = 0xFF000000 >> s;
+ Gmask = 0x00FF0000 >> s;
+ Bmask = 0x0000FF00 >> s;
+@@ -426,7 +468,7 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s
+ }
+ }
+ surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
++ bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
+ if ( surface == NULL ) {
+ error = "Out of memory";
+ goto done;
+@@ -467,6 +509,9 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s
+ /* Load the palette, if any */
+ palette = surface->format->palette;
+ if ( palette ) {
++ int png_num_palette;
++ png_colorp png_palette;
++ lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette);
+ if(color_type == PNG_COLOR_TYPE_GRAY) {
+ palette->ncolors = 256;
+ for(i = 0; i < 256; i++) {
+@@ -474,12 +519,12 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s
+ palette->colors[i].g = i;
+ palette->colors[i].b = i;
+ }
+- } else if (info_ptr->num_palette > 0 ) {
+- palette->ncolors = info_ptr->num_palette;
+- for( i=0; i<info_ptr->num_palette; ++i ) {
+- palette->colors[i].b = info_ptr->palette[i].blue;
+- palette->colors[i].g = info_ptr->palette[i].green;
+- palette->colors[i].r = info_ptr->palette[i].red;
++ } else if (png_num_palette > 0 ) {
++ palette->ncolors = png_num_palette;
++ for( i=0; i<png_num_palette; ++i ) {
++ palette->colors[i].b = png_palette[i].blue;
++ palette->colors[i].g = png_palette[i].green;
++ palette->colors[i].r = png_palette[i].red;
+ }
+ }
+ }
diff --git a/package/section.lst b/package/section.lst
index d66959632..4648fc04d 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -39,10 +39,11 @@ admin System Administration
utils Utilities
www HTTP / FTP
wifi Wireless
-x11/apps X applications
x11/lxde Lightweight X Desktop Environment
+x11/apps X applications
x11/drivers X drivers
x11/server X server
x11/libs X libraries
+x11/misc X Misc
x11/fonts X fonts
x11/devel X headers
diff --git a/package/snort/Makefile b/package/snort/Makefile
index 6321ac2f5..d8d1fc185 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -33,19 +33,19 @@ CONFIGURE_ARGS+= --disable-flexresp \
post-install:
${INSTALL_DIR} ${IDIR_SNORT}/usr/bin
${INSTALL_DIR} ${IDIR_SNORT}/etc/snort
- ${INSTALL_DATA} ${WRKBUILD}/etc/snort.conf ${IDIR_SNORT}/etc/snort/
+ ${INSTALL_DATA} ${WRKBUILD}/etc/snort.conf ${IDIR_SNORT}/etc/snort
${INSTALL_DATA} ${WRKBUILD}/etc/classification.config \
- ${IDIR_SNORT}/etc/snort/
+ ${IDIR_SNORT}/etc/snort
${INSTALL_DATA} ${WRKBUILD}/etc/gen-msg.map \
- ${IDIR_SNORT}/etc/snort/
+ ${IDIR_SNORT}/etc/snort
${INSTALL_DATA} ${WRKBUILD}/etc/reference.config \
- ${IDIR_SNORT}/etc/snort/
+ ${IDIR_SNORT}/etc/snort
${INSTALL_DATA} ${WRKBUILD}/etc/sid-msg.map \
- ${IDIR_SNORT}/etc/snort/
+ ${IDIR_SNORT}/etc/snort
${INSTALL_DATA} ${WRKBUILD}/etc/threshold.conf \
- ${IDIR_SNORT}/etc/snort/
+ ${IDIR_SNORT}/etc/snort
${INSTALL_DATA} ${WRKBUILD}/etc/unicode.map \
- ${IDIR_SNORT}/etc/snort/
+ ${IDIR_SNORT}/etc/snort
${INSTALL_BIN} ${WRKINST}/usr/bin/snort ${IDIR_SNORT}/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index d47b41966..b2d7c4dc1 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -48,9 +48,9 @@ endif
uclibc-dev-install:
${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib ${IDIR_UCLIBC_DEV}/lib
${CP} ${STAGING_TARGET_DIR}/usr/lib/libc.so ${IDIR_UCLIBC_DEV}/usr/lib
- -${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_DEV}/usr/lib
- -${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib
- -for file in libc libcrypt libdl libm libresolv librt libutil; do \
+ ${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_DEV}/usr/lib
+ ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_UCLIBC_DEV}/usr/lib
+ for file in libcrypt libdl libm libresolv librt libutil; do \
cd $(IDIR_UCLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \
done
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 93d8e8128..56b3db65a 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -23,9 +23,12 @@ include $(TOPDIR)/mk/python.mk
CONFIGURE_ENV+= PYTHON=$(PYTHON)
-post-build:
+post-install:
${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb
+ $(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
${CP} ${WRKBUILD}/src/*.xml ${STAGING_DIR}/usr/share/xcb
+ ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \
+ ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
xcb-proto-install:
${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share
diff --git a/package/xfsprogs/patches/patch-ltmain_sh b/package/xfsprogs/patches/patch-ltmain_sh
new file mode 100644
index 000000000..6c5c11607
--- /dev/null
+++ b/package/xfsprogs/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- xfsprogs-3.1.4.orig/ltmain.sh 2010-11-11 18:38:26.000000000 +0100
++++ xfsprogs-3.1.4/ltmain.sh 2011-04-01 20:20:00.951819025 +0200
+@@ -4765,7 +4765,7 @@ func_mode_link ()
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # @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*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 11:21:15 +0000