[94803] trunk/dports/graphics/openjpeg

30 Jun 2012

Revision: 94803
          https://trac.macports.org/changeset/94803
Author:   cal@macports.org
Date:     2012-06-29 17:19:42 -0700 (Fri, 29 Jun 2012)
Log Message:
-----------
openjpeg: Remove t1_generate_luts.c code from library making mplayer unusable

Reported in #34979, also see http://code.google.com/p/openjpeg/issues/detail?id=152.

Modified Paths:
--------------
    trunk/dports/graphics/openjpeg/Portfile

Added Paths:
-----------
    trunk/dports/graphics/openjpeg/files/
    trunk/dports/graphics/openjpeg/files/patch-remove-t1_generate_luts.c-causing-main-symbol.diff

Modified: trunk/dports/graphics/openjpeg/Portfile
===================================================================

--- trunk/dports/graphics/openjpeg/Portfile	2012-06-29 23:43:27 UTC (rev 94802)
+++ trunk/dports/graphics/openjpeg/Portfile	2012-06-30 00:19:42 UTC (rev 94803)
@@ -5,7 +5,7 @@
 
 name             openjpeg
 version          1.5.0
-revision            1
+revision            2
 categories       graphics
 license          BSD
 maintainers      mcalhoun openmaintainer
@@ -33,6 +33,8 @@
                  port:zlib \
                  port:jbigkit
 
+patchfiles       patch-remove-t1_generate_luts.c-causing-main-symbol.diff
+
 pre-activate {
     # openjpeg < 1.5.0 accidentally installed items directly into
     # ${prefix}/share/man bypassing ${destroot}; remove them if found.

Added: trunk/dports/graphics/openjpeg/files/patch-remove-t1_generate_luts.c-causing-main-symbol.diff
===================================================================
--- trunk/dports/graphics/openjpeg/files/patch-remove-t1_generate_luts.c-causing-main-symbol.diff	                        (rev 0)
+++ trunk/dports/graphics/openjpeg/files/patch-remove-t1_generate_luts.c-causing-main-symbol.diff	2012-06-30 00:19:42 UTC (rev 94803)
@@ -0,0 +1,93 @@
+--- libopenjpeg/t1_generate_luts.c.orig	2012-06-30 02:13:50.000000000 +0200
++++ libopenjpeg/t1_generate_luts.c	2012-06-30 02:14:18.000000000 +0200
+@@ -30,6 +30,7 @@
+  * POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#error "Compiling this file into the library will add a main symbol to it"
+ #include "opj_includes.h"
+ #include <math.h>
+ 
+--- libopenjpeg/Makefile.in.orig	2012-06-30 02:12:12.000000000 +0200
++++ libopenjpeg/Makefile.in	2012-06-30 02:12:39.000000000 +0200
+@@ -86,7 +86,7 @@
+ 	libopenjpeg_la-mct.lo libopenjpeg_la-mqc.lo \
+ 	libopenjpeg_la-openjpeg.lo libopenjpeg_la-pi.lo \
+ 	libopenjpeg_la-raw.lo libopenjpeg_la-t1.lo \
+-	libopenjpeg_la-t1_generate_luts.lo libopenjpeg_la-t2.lo \
++	libopenjpeg_la-t2.lo \
+ 	libopenjpeg_la-tcd.lo libopenjpeg_la-tgt.lo \
+ 	libopenjpeg_la-cidx_manager.lo libopenjpeg_la-phix_manager.lo \
+ 	libopenjpeg_la-ppix_manager.lo libopenjpeg_la-thix_manager.lo \
+@@ -343,7 +343,6 @@
+ pi.c \
+ raw.c \
+ t1.c \
+-t1_generate_luts.c \
+ t2.c \
+ tcd.c \
+ tgt.c \
+@@ -483,7 +482,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_la-ppix_manager.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_la-raw.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_la-t1.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_la-t1_generate_luts.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_la-t2.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_la-tcd.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_la-tgt.Plo@am__quote@
+@@ -634,14 +632,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopenjpeg_la_CPPFLAGS) $(CPPFLAGS) $(libopenjpeg_la_CFLAGS) $(CFLAGS) -c -o libopenjpeg_la-t1.lo `test -f 't1.c' || echo '$(srcdir)/'`t1.c
+ 
+-libopenjpeg_la-t1_generate_luts.lo: t1_generate_luts.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopenjpeg_la_CPPFLAGS) $(CPPFLAGS) $(libopenjpeg_la_CFLAGS) $(CFLAGS) -MT libopenjpeg_la-t1_generate_luts.lo -MD -MP -MF $(DEPDIR)/libopenjpeg_la-t1_generate_luts.Tpo -c -o libopenjpeg_la-t1_generate_luts.lo `test -f 't1_generate_luts.c' || echo '$(srcdir)/'`t1_generate_luts.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libopenjpeg_la-t1_generate_luts.Tpo $(DEPDIR)/libopenjpeg_la-t1_generate_luts.Plo
+-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='t1_generate_luts.c' object='libopenjpeg_la-t1_generate_luts.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopenjpeg_la_CPPFLAGS) $(CPPFLAGS) $(libopenjpeg_la_CFLAGS) $(CFLAGS) -c -o libopenjpeg_la-t1_generate_luts.lo `test -f 't1_generate_luts.c' || echo '$(srcdir)/'`t1_generate_luts.c
+-
+ libopenjpeg_la-t2.lo: t2.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopenjpeg_la_CPPFLAGS) $(CPPFLAGS) $(libopenjpeg_la_CFLAGS) $(CFLAGS) -MT libopenjpeg_la-t2.lo -MD -MP -MF $(DEPDIR)/libopenjpeg_la-t2.Tpo -c -o libopenjpeg_la-t2.lo `test -f 't2.c' || echo '$(srcdir)/'`t2.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libopenjpeg_la-t2.Tpo $(DEPDIR)/libopenjpeg_la-t2.Plo
+--- libopenjpeg/jpwl/Makefile.in.orig	2012-06-30 02:12:53.000000000 +0200
++++ libopenjpeg/jpwl/Makefile.in	2012-06-30 02:13:07.000000000 +0200
+@@ -83,7 +83,6 @@
+ 	libopenjpeg_JPWL_la-mqc.lo libopenjpeg_JPWL_la-openjpeg.lo \
+ 	libopenjpeg_JPWL_la-pi.lo libopenjpeg_JPWL_la-raw.lo \
+ 	libopenjpeg_JPWL_la-t1.lo \
+-	libopenjpeg_JPWL_la-t1_generate_luts.lo \
+ 	libopenjpeg_JPWL_la-t2.lo libopenjpeg_JPWL_la-tcd.lo \
+ 	libopenjpeg_JPWL_la-tgt.lo libopenjpeg_JPWL_la-cidx_manager.lo \
+ 	libopenjpeg_JPWL_la-phix_manager.lo \
+@@ -295,7 +294,6 @@
+ ../pi.c \
+ ../raw.c \
+ ../t1.c \
+-../t1_generate_luts.c \
+ ../t2.c \
+ ../tcd.c \
+ ../tgt.c \
+@@ -433,7 +431,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_JPWL_la-raw.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_JPWL_la-rs.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_JPWL_la-t1.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_JPWL_la-t1_generate_luts.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_JPWL_la-t2.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_JPWL_la-tcd.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopenjpeg_JPWL_la-tgt.Plo@am__quote@
+@@ -584,14 +581,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopenjpeg_JPWL_la_CPPFLAGS) $(CPPFLAGS) $(libopenjpeg_JPWL_la_CFLAGS) $(CFLAGS) -c -o libopenjpeg_JPWL_la-t1.lo `test -f '../t1.c' || echo '$(srcdir)/'`../t1.c
+ 
+-libopenjpeg_JPWL_la-t1_generate_luts.lo: ../t1_generate_luts.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopenjpeg_JPWL_la_CPPFLAGS) $(CPPFLAGS) $(libopenjpeg_JPWL_la_CFLAGS) $(CFLAGS) -MT libopenjpeg_JPWL_la-t1_generate_luts.lo -MD -MP -MF $(DEPDIR)/libopenjpeg_JPWL_la-t1_generate_luts.Tpo -c -o libopenjpeg_JPWL_la-t1_generate_luts.lo `test -f '../t1_generate_luts.c' || echo '$(srcdir)/'`../t1_generate_luts.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libopenjpeg_JPWL_la-t1_generate_luts.Tpo $(DEPDIR)/libopenjpeg_JPWL_la-t1_generate_luts.Plo
+-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../t1_generate_luts.c' object='libopenjpeg_JPWL_la-t1_generate_luts.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopenjpeg_JPWL_la_CPPFLAGS) $(CPPFLAGS) $(libopenjpeg_JPWL_la_CFLAGS) $(CFLAGS) -c -o libopenjpeg_JPWL_la-t1_generate_luts.lo `test -f '../t1_generate_luts.c' || echo '$(srcdir)/'`../t1_generate_luts.c
+-
+ libopenjpeg_JPWL_la-t2.lo: ../t2.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopenjpeg_JPWL_la_CPPFLAGS) $(CPPFLAGS) $(libopenjpeg_JPWL_la_CFLAGS) $(CFLAGS) -MT libopenjpeg_JPWL_la-t2.lo -MD -MP -MF $(DEPDIR)/libopenjpeg_JPWL_la-t2.Tpo -c -o libopenjpeg_JPWL_la-t2.lo `test -f '../t2.c' || echo '$(srcdir)/'`../t2.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libopenjpeg_JPWL_la-t2.Tpo $(DEPDIR)/libopenjpeg_JPWL_la-t2.Plo

    

[94803] trunk/dports/graphics/openjpeg

cal＠macports.org