[gentoo-commits] gentoo commit in src/patchsets/gpac/0.4.5: 250_all_openjpeg14.patch series

[Alexis Ballier (aballier)]

aballier    11/04/03 03:35:03

  Modified:             series
  Added:                250_all_openjpeg14.patch
  Log:
  fix build with openjpeg 1.4, bug #361359

Revision  Changes    Path
1.5                  src/patchsets/gpac/0.4.5/series

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gpac/0.4.5/series?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gpac/0.4.5/series?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gpac/0.4.5/series?r1=1.4&r2=1.5

Index: series
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gpac/0.4.5/series,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- series	16 Feb 2011 22:47:48 -0000	1.4
+++ series	3 Apr 2011 03:35:03 -0000	1.5
@@ -14,3 +14,4 @@
 220_all_respect_ldflags.patch -p0
 230_all_spidermonkey-update.patch
 240_all_libpng15.patch
+250_all_openjpeg14.patch



1.1                  src/patchsets/gpac/0.4.5/250_all_openjpeg14.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gpac/0.4.5/250_all_openjpeg14.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gpac/0.4.5/250_all_openjpeg14.patch?rev=1.1&content-type=text/plain

Index: 250_all_openjpeg14.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=361359

Index: gpac/modules/img_in/jp2_dec.c
===================================================================
--- gpac.orig/modules/img_in/jp2_dec.c
+++ gpac/modules/img_in/jp2_dec.c
@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe
 	return GF_OK;
 }
 
+char opj_version_buffer[500];
+
 static const char *JP2_GetCodecName(GF_BaseDecoder *dec)
 {
+#ifndef OPENJPEG_VERSION
+	snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version());
+	return opj_version_buffer;
+#else
 	return "OpenJPEG "OPENJPEG_VERSION ;
+#endif
 }