summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gdal.mk4
-rw-r--r--src/hdf5.mk2
-rw-r--r--src/id3lib-2-zlib.patch14
-rw-r--r--src/id3lib-3-header.patch23
-rw-r--r--src/id3lib-4-utf16.patch38
-rw-r--r--src/id3lib-5-fix-nullptrderef.patch12
-rw-r--r--src/id3lib-6-fix-crash-vbr.patch19
-rw-r--r--src/imagemagick.mk4
-rw-r--r--src/libbs2b.mk24
-rw-r--r--src/libcilkrts.mk33
-rw-r--r--src/qt.mk2
11 files changed, 169 insertions, 6 deletions
diff --git a/src/gdal.mk b/src/gdal.mk
index 6994b47..ac1eda7 100644
--- a/src/gdal.mk
+++ b/src/gdal.mk
@@ -7,8 +7,8 @@ $(PKG)_VERSION := 1.11.0
$(PKG)_CHECKSUM := 25efd2bffdea2e841377ca8c1fd49d89d02ac87e
$(PKG)_SUBDIR := gdal-$($(PKG)_VERSION)
$(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL := http://download.osgeo.org/gdal/CURRENT/$($(PKG)_FILE)
-$(PKG)_URL_2 := ftp://ftp.remotesensing.org/gdal/CURRENT/$($(PKG)_FILE)
+$(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL_2 := ftp://ftp.remotesensing.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc proj zlib libpng tiff libgeotiff jpeg jasper giflib expat sqlite curl geos postgresql gta hdf4 hdf5 netcdf
define $(PKG)_UPDATE
diff --git a/src/hdf5.mk b/src/hdf5.mk
index ea765b9..393f190 100644
--- a/src/hdf5.mk
+++ b/src/hdf5.mk
@@ -7,7 +7,7 @@ $(PKG)_VERSION := 1.8.12
$(PKG)_CHECKSUM := 8414ca0e6ff7d08e423955960d641ec5f309a55f
$(PKG)_SUBDIR := hdf5-$($(PKG)_VERSION)
$(PKG)_FILE := hdf5-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL := http://www.hdfgroup.org/ftp/HDF5/current/src/$($(PKG)_FILE)
+$(PKG)_URL := http://www.hdfgroup.org/ftp/HDF5/releases/$($(PKG)_SUBDIR)/src/$($(PKG)_FILE)
$(PKG)_DEPS := gcc zlib pthreads
define $(PKG)_UPDATE
diff --git a/src/id3lib-2-zlib.patch b/src/id3lib-2-zlib.patch
new file mode 100644
index 0000000..e937877
--- /dev/null
+++ b/src/id3lib-2-zlib.patch
@@ -0,0 +1,14 @@
+This patch was first introduced in version 3.8.3-3
+
+It fixes http://bugs.debian.org/208672
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,6 +74,8 @@
+
+ if ID3_NEEDZLIB
+ LDADD = $(top_builddir)/zlib/src/libz.la
++else
++libid3_la_LIBADD = -lz
+ endif
+
+ libid3_la_LDFLAGS = \
diff --git a/src/id3lib-3-header.patch b/src/id3lib-3-header.patch
new file mode 100644
index 0000000..1eaa5c6
--- /dev/null
+++ b/src/id3lib-3-header.patch
@@ -0,0 +1,23 @@
+diff -ru id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h
+--- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/include/id3/id3lib_strings.h 2010-01-23 14:15:24.000000000 +0100
+@@ -30,6 +30,7 @@
+ #define _ID3LIB_STRINGS_H_
+
+ #include <string>
++#include <cstring>
+
+ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
+ namespace std
+diff -ru id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h
+--- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/include/id3/writers.h 2010-01-23 14:15:24.000000000 +0100
+@@ -30,7 +30,7 @@
+
+ #include "id3/writer.h"
+ #include "id3/id3lib_streams.h"
+-//#include <string.h>
++#include <cstring>
+
+ class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
+ { \ No newline at end of file
diff --git a/src/id3lib-4-utf16.patch b/src/id3lib-4-utf16.patch
new file mode 100644
index 0000000..3d3f50f
--- /dev/null
+++ b/src/id3lib-4-utf16.patch
@@ -0,0 +1,38 @@
+Patch from 'Spoon' to fix issues with writing certain unicode characters
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2006-02-17 Jerome Couderc
++
++ * Patch from Spoon to fix UTF-16 writing bug
++ http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++
+ 2003-03-02 Sunday 17:38 Thijmen Klok <thijmen@id3lib.org>
+
+ * THANKS (1.20): added more people
+--- a/src/io_helpers.cpp
++++ b/src/io_helpers.cpp
+@@ -363,11 +363,22 @@
+ // Write the BOM: 0xFEFF
+ unicode_t BOM = 0xFEFF;
+ writer.writeChars((const unsigned char*) &BOM, 2);
++ // Patch from Spoon : 2004-08-25 14:17
++ // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++ // Wrong code
++ //for (size_t i = 0; i < size; i += 2)
++ //{
++ // unicode_t ch = (data[i] << 8) | data[i+1];
++ // writer.writeChars((const unsigned char*) &ch, 2);
++ //}
++ // Right code
++ unsigned char *pdata = (unsigned char *) data.c_str();
+ for (size_t i = 0; i < size; i += 2)
+ {
+- unicode_t ch = (data[i] << 8) | data[i+1];
++ unicode_t ch = (pdata[i] << 8) | pdata[i+1];
+ writer.writeChars((const unsigned char*) &ch, 2);
+ }
++ // End patch
+ }
+ return writer.getCur() - beg;
+ }
diff --git a/src/id3lib-5-fix-nullptrderef.patch b/src/id3lib-5-fix-nullptrderef.patch
new file mode 100644
index 0000000..d4ca5d2
--- /dev/null
+++ b/src/id3lib-5-fix-nullptrderef.patch
@@ -0,0 +1,12 @@
+This patch adds a check for a null pointer
+--- a/src/header_tag.cpp
++++ b/src/header_tag.cpp
+@@ -54,7 +54,7 @@
+ {
+ size_t bytesUsed = ID3_TagHeader::SIZE;
+
+- if (_info->is_extended)
++ if (_info && _info->is_extended)
+ {
+ bytesUsed += _info->extended_bytes;
+ }
diff --git a/src/id3lib-6-fix-crash-vbr.patch b/src/id3lib-6-fix-crash-vbr.patch
new file mode 100644
index 0000000..9bf33e9
--- /dev/null
+++ b/src/id3lib-6-fix-crash-vbr.patch
@@ -0,0 +1,19 @@
+Description: Fix crashes when reading VBR MP3 file.
+Bug-Ubuntu: https://launchpad.net/bugs/444466
+Origin: upstream, http://sourceforge.net/tracker/?func=detail&aid=937707&group_id=979&atid=300979
+Forwarded: yes
+Author: Urs Fleisch
+
+Index: id3lib3.8.3-3.8.3/src/mp3_parse.cpp
+===================================================================
+--- id3lib3.8.3-3.8.3.orig/src/mp3_parse.cpp 2009-10-06 23:12:10.381250132 +0200
++++ id3lib3.8.3-3.8.3/src/mp3_parse.cpp 2009-10-06 23:14:09.545252591 +0200
+@@ -465,7 +465,7 @@
+ // from http://www.xingtech.com/developer/mp3/
+
+ const size_t VBR_HEADER_MIN_SIZE = 8; // "xing" + flags are fixed
+- const size_t VBR_HEADER_MAX_SIZE = 116; // frames, bytes, toc and scale are optional
++ const size_t VBR_HEADER_MAX_SIZE = 120; // frames, bytes, toc and scale are optional
+
+ if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE)
+ {
diff --git a/src/imagemagick.mk b/src/imagemagick.mk
index d379f4e..e5345e5 100644
--- a/src/imagemagick.mk
+++ b/src/imagemagick.mk
@@ -7,8 +7,8 @@ $(PKG)_VERSION := 6.8.8-3
$(PKG)_CHECKSUM := 8e69b64ee1fc9f9131abbc4bf38d9c27ab60ebce
$(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION)
$(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://www.imagemagick.org/download/$($(PKG)_FILE)
-$(PKG)_URL_2 := http://ftp.nluug.nl/ImageMagick/$($(PKG)_FILE)
+$(PKG)_URL := http://www.imagemagick.org/download/releases/$($(PKG)_FILE)
+$(PKG)_URL_2 := http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/$($(PKG)_FILE)
$(PKG)_DEPS := gcc bzip2 ffmpeg fftw freetype jasper jpeg lcms liblqr-1 libpng libltdl openexr pthreads tiff
define $(PKG)_UPDATE
diff --git a/src/libbs2b.mk b/src/libbs2b.mk
new file mode 100644
index 0000000..f1bfb3d
--- /dev/null
+++ b/src/libbs2b.mk
@@ -0,0 +1,24 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG := libbs2b
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 2.7
+$(PKG)_CHECKSUM := 80eaaa5cc576c35dd28863767b795c50cbcc0511
+$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/bs2b/libbs2b/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS := gcc libsndfile
+
+define $(PKG)_UPDATE
+ $(WGET) -q -O- 'http://sourceforge.net/projects/bs2b/files/libbs2b/' | \
+ $(SED) -n 's,.*<a href="/projects/bs2b/files/libbs2b/\([0-9][^"]*\)/".*,\1,p' | \
+ head -1
+endef
+
+define $(PKG)_BUILD
+ cd '$(1)' && ./configure \
+ $(MXE_CONFIGURE_OPTS)
+ $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined'
+ $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined'
+endef \ No newline at end of file
diff --git a/src/libcilkrts.mk b/src/libcilkrts.mk
new file mode 100644
index 0000000..0a7cc5e
--- /dev/null
+++ b/src/libcilkrts.mk
@@ -0,0 +1,33 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG := libcilkrts
+$(PKG)_IGNORE = $(gcc_IGNORE)
+$(PKG)_VERSION = $(gcc_VERSION)
+$(PKG)_CHECKSUM = $(gcc_CHECKSUM)
+$(PKG)_SUBDIR = $(gcc_SUBDIR)
+$(PKG)_FILE = $(gcc_FILE)
+$(PKG)_URL = $(gcc_URL)
+$(PKG)_URL_2 = $(gcc_URL_2)
+$(PKG)_DEPS := gcc
+
+define $(PKG)_UPDATE
+ echo $(gcc_VERSION)
+endef
+
+define $(PKG)_BUILD
+ mkdir -p '$(1).build'
+ cd '$(1).build' && '$(1)/libgomp/configure' \
+ $(MXE_CONFIGURE_OPTS) \
+ --prefix='$(PREFIX)' \
+ --enable-version-specific-runtime-libs \
+ --with-gnu-ld \
+ LIBS='-lws2_32' \
+ ac_cv_prog_FC='$(TARGET)-gfortran'
+ $(MAKE) -C '$(1).build' -j '$(JOBS)' install
+
+ '$(TARGET)-gcc' \
+ -W -Wall -Werror -ansi -pedantic \
+ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgomp.exe' \
+ -fopenmp
+endef
diff --git a/src/qt.mk b/src/qt.mk
index 3233d48..889394e 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -7,7 +7,7 @@ $(PKG)_VERSION := 4.8.6
$(PKG)_CHECKSUM := ddf9c20ca8309a116e0466c42984238009525da6
$(PKG)_SUBDIR := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL := http://download.qt-project.org/official_releases/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/archive/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus
define $(PKG)_UPDATE
generated by cgit v0.12 at 2024-07-01 10:32:04 (GMT)