Conflicts: Makefile src/gd.mk src/gdal.mk src/imagemagick.mk src/pcl.mk src/qt.mkpull/497/head
Timothy Gu
10 years ago
commit
262aa647f0
@ -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 = \
|
||||
@ -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
|
||||
{
|
||||
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
@ -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)
|
||||
{
|
||||
@ -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
|
||||
@ -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
|
||||
Loading…
Reference in new issue