summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Gahde2017-03-09 21:58:46 +0100
committerJakob Gahde2017-03-09 21:58:46 +0100
commit8f728a5d39fb4d6065306424c0ecce1ad05d3707 (patch)
tree6647e58a7f7c8e49a85a37f30cd6816a10a80968
parent921590e8445435c228798d42aa620b6488bfb086 (diff)
downloadaur-mediatomb.tar.gz
mediatomb 0.12.1-15: Add patch to fix truncated auxdata
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--truncated_auxdata.patch13
3 files changed, 24 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f328c828472..a84d219aac5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Jan 20 15:37:37 UTC 2017
+# Thu Mar 9 20:57:56 UTC 2017
pkgbase = mediatomb
pkgdesc = Free UPnP/DLNA media server
pkgver = 0.12.1
- pkgrel = 14
+ pkgrel = 15
url = http://mediatomb.cc/
install = mediatomb.install
arch = i686
@@ -33,6 +33,7 @@ pkgbase = mediatomb
source = libmp4v2_191_p497.patch
source = libavformat.patch
source = symlinks.patch
+ source = truncated_auxdata.patch
sha256sums = 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd
sha256sums = 99e2602eebb9f5236107b0bee473a4187c7df7732745ad83542a3dcca9cb7d5a
sha256sums = e46de674e49aa85116a8ff127908f7bac21198ce7625404004b8b7832eccd3f4
@@ -45,6 +46,7 @@ pkgbase = mediatomb
sha256sums = d39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84
sha256sums = 76b11706d70ed8f5e157d96ca441c90c46c42176102fcb651b4ab1102b61bfee
sha256sums = 72f7532d7cd827ab655df652d2912175739fe16d2b1ad989d987a0b147a1d2e8
+ sha256sums = a831bc5d107345bcb6e2d417b7cb0d6890dfde8e262f0cf532d21998cfc42db7
pkgname = mediatomb
diff --git a/PKGBUILD b/PKGBUILD
index 88b12b0c923..7337c7d14b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
pkgname=mediatomb
pkgver=0.12.1
-pkgrel=14
+pkgrel=15
pkgdesc="Free UPnP/DLNA media server"
arch=('i686' 'x86_64' 'armv6h')
url="http://mediatomb.cc/"
@@ -29,7 +29,8 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
'libav_0.7_support.patch'
'libmp4v2_191_p497.patch'
'libavformat.patch'
- 'symlinks.patch')
+ 'symlinks.patch'
+ 'truncated_auxdata.patch')
sha256sums=('31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd'
'99e2602eebb9f5236107b0bee473a4187c7df7732745ad83542a3dcca9cb7d5a'
'e46de674e49aa85116a8ff127908f7bac21198ce7625404004b8b7832eccd3f4'
@@ -41,7 +42,8 @@ sha256sums=('31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd'
'c6523e8bf5e2da89b7475d6777ef9bffe7d089752ef2f7b27b5e39a4130fb0ff'
'd39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84'
'76b11706d70ed8f5e157d96ca441c90c46c42176102fcb651b4ab1102b61bfee'
- '72f7532d7cd827ab655df652d2912175739fe16d2b1ad989d987a0b147a1d2e8')
+ '72f7532d7cd827ab655df652d2912175739fe16d2b1ad989d987a0b147a1d2e8'
+ 'a831bc5d107345bcb6e2d417b7cb0d6890dfde8e262f0cf532d21998cfc42db7')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -53,6 +55,8 @@ prepare() {
patch -Np1 < "${srcdir}/libmp4v2_191_p497.patch"
patch -Np1 < "${srcdir}/libavformat.patch"
patch -Np1 < "${srcdir}/symlinks.patch"
+ # See https://sourceforge.net/p/mediatomb/bugs/78/
+ patch -Np1 < "${srcdir}/truncated_auxdata.patch"
}
build() {
diff --git a/truncated_auxdata.patch b/truncated_auxdata.patch
new file mode 100644
index 00000000000..89957c2c4e2
--- /dev/null
+++ b/truncated_auxdata.patch
@@ -0,0 +1,13 @@
+diff -Nru mediatomb-0.12.1/src/metadata/taglib_handler.cc mediatomb-0.12.1.new/src/metadata/taglib_handler.cc
+--- mediatomb-0.12.1/src/metadata/taglib_handler.cc 2010-03-25 15:58:10.000000000 +0100
++++ mediatomb-0.12.1.new/src/metadata/taglib_handler.cc 2013-04-16 14:23:00.772805429 +0200
+@@ -227,7 +227,8 @@
+ {
+ TagLib::String frameContents = textFrame->toString();
+ //log_debug("We have a match!!!!: %s\n", frameContents.toCString(true));
+- String value(frameContents.toCString(true), frameContents.size());
++ //String value(frameContents.toCString(true), frameContents.size());
++ String value(frameContents.toCString(true));
+ value = sc->convert(value);
+ log_debug("Adding frame: %s with value %s\n", desiredFrame.c_str(), value.c_str());
+ item->setAuxData(desiredFrame, value);