[packages/vdr] - added libjpeg patch (makes it compatible with libjpeg 9) - fixed lib64 builds

[qboosh]

commit 37b2c76f94f18c89e8240f9f59adb0efadbcb4fc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 15 11:06:51 2013 +0200

    - added libjpeg patch (makes it compatible with libjpeg 9)
    - fixed lib64 builds

 vdr-libjpeg.patch | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 vdr.spec          |  7 ++++--
 2 files changed, 69 insertions(+), 2 deletions(-)
---
diff --git a/vdr.spec b/vdr.spec
index ee8f5d8..85d3185 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -18,6 +18,7 @@ Source1:	http://207.44.152.197/%{name}-sc-%{sc_ver}.tar.gz
 # Source1-md5:	d02d88213fcfb9b6c3f8c819eab4be68
 Source2:	http://home.vrweb.de/~rnissl/%{name}-xine-%{xine_ver}.tgz
 # Source2-md5:	0374123d6991f55d91122b020361d8f6
+Patch0:		%{name}-libjpeg.patch
 URL:		http://www.tvdr.de/
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 2
@@ -75,6 +76,7 @@ Wtyczka xine dla VDR.
 
 %prep
 %setup -q
+%patch0 -p1
 
 cd PLUGINS/src
 for plugin in *; do
@@ -107,7 +109,7 @@ cd ../..
 	LOCDIR="%{_localedir}" \
 	CONFDIR="%{_sysconfdir}/%{name}" \
 	VIDEODIR=/var/lib/vdr \
-	PLUGINLIBDIR="%{_libdir}/%{name}" \
+	LIBDIR="%{_libdir}/%{name}" \
 	BIDI=1 \
 	REMOTE=LIRC
 
@@ -126,7 +128,8 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{plugins,themes}
 	PREFIX="%{_prefix}" \
 	LOCDIR="%{_localedir}" \
 	VIDEODIR=/var/lib/vdr \
-	PLUGINLIBDIR="%{_libdir}/%{name}"
+	LIBDIR="%{_libdir}/%{name}" \
+	PCDIR=%{_pkgconfigdir}
 
 cp -p *.conf{,.*} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
diff --git a/vdr-libjpeg.patch b/vdr-libjpeg.patch
new file mode 100644
index 0000000..0cb023d
--- /dev/null
+++ b/vdr-libjpeg.patch
@@ -0,0 +1,64 @@
+--- vdr-2.0.3/tools.c.orig	2012-12-08 12:16:30.000000000 +0100
++++ vdr-2.0.3/tools.c	2013-09-15 10:13:54.699139218 +0200
+@@ -1152,15 +1152,15 @@
+         }
+      else {
+         esyslog("ERROR: out of memory");
+-        return false;
++        return FALSE;
+         }
+      if (jcd->mem) {
+         cinfo->dest->next_output_byte = jcd->mem + Used;
+         cinfo->dest->free_in_buffer = jcd->size - Used;
+-        return true;
++        return TRUE;
+         }
+      }
+-  return false;
++  return FALSE;
+ }
+ 
+ static void JpegCompressTermDestination(j_compress_ptr cinfo)
+@@ -1205,8 +1205,8 @@
+   cinfo.in_color_space = JCS_RGB;
+ 
+   jpeg_set_defaults(&cinfo);
+-  jpeg_set_quality(&cinfo, Quality, true);
+-  jpeg_start_compress(&cinfo, true);
++  jpeg_set_quality(&cinfo, Quality, TRUE);
++  jpeg_start_compress(&cinfo, TRUE);
+ 
+   int rs = Width * 3;
+   JSAMPROW rp[Height];
+--- vdr-2.0.3/PLUGINS/src/dvbhddevice/dvbhdffdevice.c.orig	2013-04-11 10:41:16.000000000 +0200
++++ vdr-2.0.3/PLUGINS/src/dvbhddevice/dvbhdffdevice.c	2013-09-15 10:47:51.627168297 +0200
+@@ -1023,15 +1023,15 @@
+         }
+      else {
+         esyslog("ERROR: out of memory");
+-        return false;
++        return FALSE;
+         }
+      if (jcd->mem) {
+         cinfo->dest->next_output_byte = jcd->mem + Used;
+         cinfo->dest->free_in_buffer = jcd->size - Used;
+-        return true;
++        return TRUE;
+         }
+      }
+-  return false;
++  return FALSE;
+ }
+ 
+ static void JpegCompressTermDestination(j_compress_ptr cinfo)
+@@ -1076,8 +1076,8 @@
+   cinfo.in_color_space = JCS_YCbCr;
+ 
+   jpeg_set_defaults(&cinfo);
+-  jpeg_set_quality(&cinfo, Quality, true);
+-  jpeg_start_compress(&cinfo, true);
++  jpeg_set_quality(&cinfo, Quality, TRUE);
++  jpeg_start_compress(&cinfo, TRUE);
+ 
+   int rs = Width * 3;
+   JSAMPROW rp[Height];
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vdr.git/commitdiff/37b2c76f94f18c89e8240f9f59adb0efadbcb4fc