summaryrefslogtreecommitdiff
path: root/graphics/EZWGL/files
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/EZWGL/files')
-rw-r--r--graphics/EZWGL/files/patch-Make.common.in13
-rw-r--r--graphics/EZWGL/files/patch-Makefile.in16
-rw-r--r--graphics/EZWGL/files/patch-configure11
-rw-r--r--graphics/EZWGL/files/patch-include__Makefile.in11
-rw-r--r--graphics/EZWGL/files/patch-lib_EZ__Png.c58
-rw-r--r--graphics/EZWGL/files/patch-lib__Makefile.in73
6 files changed, 0 insertions, 182 deletions
diff --git a/graphics/EZWGL/files/patch-Make.common.in b/graphics/EZWGL/files/patch-Make.common.in
deleted file mode 100644
index e3633aa93e29..000000000000
--- a/graphics/EZWGL/files/patch-Make.common.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Make.common.in.orig 1999-12-03 21:48:54 UTC
-+++ Make.common.in
-@@ -30,8 +30,8 @@
- LN = @LN@
- RANLIB = @RANLIB@
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL@ -s -m 755
--INSTALL_DATA = @INSTALL@ -m 644
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
- CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
diff --git a/graphics/EZWGL/files/patch-Makefile.in b/graphics/EZWGL/files/patch-Makefile.in
deleted file mode 100644
index db85ae03bfaa..000000000000
--- a/graphics/EZWGL/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig 1999-12-03 21:48:54 UTC
-+++ Makefile.in
-@@ -25,11 +25,11 @@
-
- all shared static:
- @for I in ${subdirs}; do (cd $$I; ${MAKE} $@ || exit 1); done
-- @for I in ${sampledirs}; do (cd $$I; ${MAKE}); done
-+# @for I in ${sampledirs}; do (cd $$I; ${MAKE}); done
-
-
- install install-shared install-static:
-- @for I in $(subdirs); do (cd $$I; $(MAKE) DESTDIR=/usr/local \
-+ @for I in $(subdirs); do (cd $$I; $(MAKE) DESTDIR=$(prefix) \
- $@ || exit 1); done
-
- clean:
diff --git a/graphics/EZWGL/files/patch-configure b/graphics/EZWGL/files/patch-configure
deleted file mode 100644
index 3f8e7999892b..000000000000
--- a/graphics/EZWGL/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 1999-12-03 21:48:55 UTC
-+++ configure
-@@ -1008,7 +1008,7 @@
- fi
- CFLAGS="$CCOPTS"
- fi
--CFLAGS="${CFLAGS} -fpic"
-+CFLAGS="${CFLAGS}"
-
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
diff --git a/graphics/EZWGL/files/patch-include__Makefile.in b/graphics/EZWGL/files/patch-include__Makefile.in
deleted file mode 100644
index fe040c63247f..000000000000
--- a/graphics/EZWGL/files/patch-include__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/Makefile.in.orig 1999-12-03 21:49:18 UTC
-+++ include/Makefile.in
-@@ -9,7 +9,7 @@
- install-shared install-static: install
-
- install:
-- $(CP) EZ.h $(destincludedir)
-+ $(INSTALL_DATA) EZ.h $(destincludedir)
-
- clean realclean:
-
diff --git a/graphics/EZWGL/files/patch-lib_EZ__Png.c b/graphics/EZWGL/files/patch-lib_EZ__Png.c
deleted file mode 100644
index bf1a0272634f..000000000000
--- a/graphics/EZWGL/files/patch-lib_EZ__Png.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- lib/EZ_Png.c.orig 1999-12-03 21:49:22 UTC
-+++ lib/EZ_Png.c
-@@ -61,14 +61,14 @@ static int EZ_ReadPng(fname, w_ret, h_re
- fclose(fp);
- return(0);
- }
-- if(setjmp(png_ptr->jmpbuf))
-+ if(setjmp(png_jmpbuf(png_ptr)))
- {
- fclose(fp);
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- return(0);
- }
-
-- if(info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+ if(png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
- {
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- return(0);
-@@ -77,15 +77,22 @@ static int EZ_ReadPng(fname, w_ret, h_re
- png_read_info(png_ptr, info_ptr); /* header */
- png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, &interlace_type, NULL, NULL);
-
-- if(info_ptr->bit_depth < 8) png_set_packing(png_ptr);
-+ if(png_get_bit_depth(png_ptr, info_ptr) < 8) png_set_packing(png_ptr);
- if(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_expand(png_ptr);
- png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
-
-- if(info_ptr->valid & PNG_INFO_gAMA) png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
-+ if(png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA)) {
-+ double gamma;
-+ png_get_gAMA(png_ptr, info_ptr, &gamma);
-+ png_set_gamma(png_ptr, 2.2, gamma);
-+ }
- else png_set_gamma(png_ptr, 2.2, 0.45);
-
-- if(info_ptr->valid & PNG_INFO_bKGD)
-- png_set_background(png_ptr, &info_ptr->background, PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-+ if(png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD)) {
-+ png_color_16 my_background;
-+ png_get_bKGD(png_ptr, info_ptr, &my_background);
-+ png_set_background(png_ptr, &my_background, PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-+ }
- else
- {
- png_color_16 my_background;
-@@ -93,9 +100,9 @@ static int EZ_ReadPng(fname, w_ret, h_re
- png_set_background(png_ptr, &my_background, PNG_BACKGROUND_GAMMA_SCREEN, 0, 2.2);
- }
-
-- if(info_ptr->bit_depth == 16) png_set_strip_16(png_ptr);
-+ if(png_get_bit_depth(png_ptr, info_ptr) == 16) png_set_strip_16(png_ptr);
-
-- if(info_ptr->color_type == PNG_COLOR_TYPE_GRAY || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+ if(png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY || png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
- png_set_expand(png_ptr);
-
- if((data = (unsigned char *)my_malloc( 4 * w * (h+1)* sizeof(unsigned char), _PNG_IMAGE_)) == NULL)
diff --git a/graphics/EZWGL/files/patch-lib__Makefile.in b/graphics/EZWGL/files/patch-lib__Makefile.in
deleted file mode 100644
index efa3ca8e6000..000000000000
--- a/graphics/EZWGL/files/patch-lib__Makefile.in
+++ /dev/null
@@ -1,73 +0,0 @@
---- lib/Makefile.in.orig 1999-12-03 21:49:27 UTC
-+++ lib/Makefile.in
-@@ -4,9 +4,9 @@
-
- #----------------------------------------------------------------------------------
-
--all: shared
-+all: static shared
-
--install: install-shared
-+install: install-static install-shared
-
- static: libEZ.a
-
-@@ -92,31 +92,26 @@
- #----------------------------------------------------------------------------------
-
- OBJ = $(SRC:.c=.o)
-+SOBJ = $(SRC:.c=.so)
-
--libEZ.so.$(MAJORVERSION): libEZ.so.$(MAJORVERSION).$(MINORVERSION)
-+libEZ.so.$(MAJORVERSION): $(SOBJ)
- - $(RMF) libEZ.so.$(MAJORVERSION)
-- $(LN) -s libEZ.so.$(MAJORVERSION).$(MINORVERSION) libEZ.so.$(MAJORVERSION)
-+ $(CC) -shared -Wl,-soname,$@ -o $@ $(SOBJ)
- - $(RMF) libEZ.so
-- $(LN) -s libEZ.so.$(MAJORVERSION) libEZ.so
--
--libEZ.so.$(MAJORVERSION).$(MINORVERSION): $(OBJ)
-- $(CC) -shared -o libEZ.so.$(MAJORVERSION).$(MINORVERSION) $(OBJ)
--
-+ $(LN) -sf $@ libEZ.so
-
- libEZ.a: $(OBJ)
- $(AR) r libEZ.a $(OBJ)
- $(RANLIB) libEZ.a
-
- install-shared: shared
-- $(CP) libEZ.so.$(MAJORVERSION).$(MINORVERSION) $(destlibdir)
- - $(RMF) $(destlibdir)/libEZ.so $(destlibdir)/libEZ.so.$(MAJORVERSION)
-- $(LN) -s $(destlibdir)/libEZ.so.$(MAJORVERSION).$(MINORVERSION) $(destlibdir)/libEZ.so.$(MAJORVERSION)
-- $(LN) -s $(destlibdir)/libEZ.so.$(MAJORVERSION) $(destlibdir)/libEZ.so
-- - (lldconfig >/dev/null || /sbin/ldconfig)
-+ $(INSTALL_DATA) libEZ.so.$(MAJORVERSION) $(destlibdir)
-+ $(LN) -sf libEZ.so.$(MAJORVERSION) $(destlibdir)/libEZ.so
-
-
--install-static: shared
-- $(CP) libEZ.a $(destlibdir)
-+install-static: static
-+ $(INSTALL_DATA) libEZ.a $(destlibdir)
- $(RANLIB) $(destlibdir)/libEZ.a
-
- clean:
-@@ -137,12 +132,16 @@
- fnmatch.o: fnmatch.c
- $(CC) $(LINC) $(CFLAGS) -c fnmatch.c
-
-+.SUFFIXES: .c .so .o
-+
- .c.o:
-- $(CC) $(LINC) $(XINC) $(CFLAGS) -c $<
-+ $(CC) $(LINC) $(XINC) $(CPPFLAGS) $(CFLAGS) -c $<
-
-+.c.so:
-+ $(CC) $(LINC) $(XINC) $(CPPFLAGS) $(CFLAGS) -fpic -DPIC -c $< -o $@
-
- .c:
-- $(CC) $(LINC) $(XINC) $(CFLAGS) $< -o $@ -L./ -lEZ $(XLIB) $(LIBS)
-+ $(CC) $(LINC) $(XINC) $(CPPFLAGS) $(CFLAGS) $< -o $@ -L./ -lEZ $(XLIB) $(LIBS)
-
- #----------------------------------------------------------------------------------
-