[csw-devel] SF.net SVN: gar:[21276] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Jun 5 11:54:01 CEST 2013


Revision: 21276
          http://gar.svn.sourceforge.net/gar/?rev=21276&view=rev
Author:   dmichelsen
Date:     2013-06-05 09:54:01 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
libmng/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/libmng/
    csw/mgar/pkg/libmng/Makefile
    csw/mgar/pkg/libmng/branches/
    csw/mgar/pkg/libmng/tags/
    csw/mgar/pkg/libmng/trunk/
    csw/mgar/pkg/libmng/trunk/Makefile
    csw/mgar/pkg/libmng/trunk/checksums
    csw/mgar/pkg/libmng/trunk/files/
    csw/mgar/pkg/libmng/trunk/files/0001-Do-not-use-AM_C_PROTOTYPES-any-more.patch
    csw/mgar/pkg/libmng/trunk/files/libmng-automake.patch
    csw/mgar/pkg/libmng/trunk/files/libmng-gcc4.patch

Added: csw/mgar/pkg/libmng/Makefile
===================================================================
--- csw/mgar/pkg/libmng/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libmng/Makefile	2013-06-05 09:54:01 UTC (rev 21276)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/libmng/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/libmng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmng/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libmng/trunk/Makefile	2013-06-05 09:54:01 UTC (rev 21276)
@@ -0,0 +1,52 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = libmng
+VERSION = 1.0.10
+GARTYPE = v2
+
+DESCRIPTION = Library for Multiple-image Network Graphics format (MNG)
+
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES  = $(DISTNAME).tar.bz2
+
+# Taken from https://github.com/freddix/libmng
+PATCHFILES += libmng-automake.patch
+PATCHFILES += libmng-gcc4.patch
+
+PATCHFILES += 0001-Do-not-use-AM_C_PROTOTYPES-any-more.patch
+
+VENDOR_URL = http://libmng.com
+
+BUILD_DEP_PKGS += CSWlibjpeg-dev
+BUILD_DEP_PKGS += CSWliblcms-dev
+BUILD_DEP_PKGS += CSWlibz-dev
+
+PACKAGES += CSWlibmng1
+SPKG_DESC_CSWlibmng1 = Library for Multiple-image Network Graphics format (MNG), libmng.so.1
+PKGFILES_CSWlibmng1 += $(call pkgfiles_lib,libmng.so.1)
+RUNTIME_DEP_PKGS_CSWlibmng1 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibmng1 += CSWliblcms1
+RUNTIME_DEP_PKGS_CSWlibmng1 += CSWlibz1
+OBSOLETED_BY_CSWlibmng1 += CSWlibmng
+
+PACKAGES += CSWlibmng-dev
+SPKG_DESC_CSWlibmng-dev = Development files for libmng.so.1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibmng-dev += CSWlibmng1
+
+BUILD64_LIBS_ONLY = 1
+
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --with-jpeg
+CONFIGURE_ARGS += --with-zlib
+
+include gar/category.mk
+
+pre-configure:
+	cd $(WORKSRC) && cp makefiles/Makefile.am .
+	cd $(WORKSRC) && cp makefiles/configure.in .
+	cd $(WORKSRC) && cp doc/makefiles/Makefile.am doc
+	cd $(WORKSRC) && cp doc/man/makefiles/Makefile.am doc/man
+	cd $(WORKSRC) && bash unmaintained/autogen.sh
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/libmng/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/libmng/trunk/checksums
===================================================================
--- csw/mgar/pkg/libmng/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/libmng/trunk/checksums	2013-06-05 09:54:01 UTC (rev 21276)
@@ -0,0 +1 @@
+eaf1476a3bb29f6190bca660e6abef16  libmng-1.0.10.tar.bz2

Added: csw/mgar/pkg/libmng/trunk/files/0001-Do-not-use-AM_C_PROTOTYPES-any-more.patch
===================================================================
--- csw/mgar/pkg/libmng/trunk/files/0001-Do-not-use-AM_C_PROTOTYPES-any-more.patch	                        (rev 0)
+++ csw/mgar/pkg/libmng/trunk/files/0001-Do-not-use-AM_C_PROTOTYPES-any-more.patch	2013-06-05 09:54:01 UTC (rev 21276)
@@ -0,0 +1,24 @@
+From 3c71ed89f828e91881b75182ab90c4d9f8eaf8a6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 5 Jun 2013 11:16:31 +0200
+Subject: [PATCH] Do not use AM_C_PROTOTYPES any more
+
+---
+ makefiles/configure.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/makefiles/configure.in b/makefiles/configure.in
+index e7cb75c..2407191 100644
+--- a/makefiles/configure.in
++++ b/makefiles/configure.in
+@@ -15,7 +15,6 @@ AC_SUBST(VERSION)
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
+ if test "x$U" != "x"; then
+   AC_MSG_ERROR(Compiler not ANSI compliant)
+ fi
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/libmng/trunk/files/libmng-automake.patch
===================================================================
--- csw/mgar/pkg/libmng/trunk/files/libmng-automake.patch	                        (rev 0)
+++ csw/mgar/pkg/libmng/trunk/files/libmng-automake.patch	2013-06-05 09:54:01 UTC (rev 21276)
@@ -0,0 +1,38 @@
+--- libmng-1.0.10/makefiles/Makefile.am.orig	2004-09-18 09:39:43.000000000 +0200
++++ libmng-1.0.10/makefiles/Makefile.am	2007-07-16 19:43:07.285858201 +0200
+@@ -2,8 +2,10 @@
+ 
+ AUTOMAKE_OPTIONS = 1.3 foreign no-dependencies
+ 
++SUBDIRS = doc
++
+ # include the app subdirectories in the distribution
+-EXTRA_DIST = makefiles doc contrib
++EXTRA_DIST = makefiles contrib
+ 
+ 
+ # libmng release @VERSION@
+--- libmng-1.0.10/makefiles/configure.in.orig	2005-01-30 11:28:00.000000000 +0100
++++ libmng-1.0.10/makefiles/configure.in	2007-07-16 19:43:24.774854842 +0200
+@@ -189,5 +189,5 @@
+ 
+   test $_restore -eq 1 && CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
+ 
+-AC_CONFIG_FILES([Makefile])
++  AC_CONFIG_FILES([Makefile doc/Makefile doc/man/Makefile])
+ AC_OUTPUT
+diff -Nru libmng-1.0.5.orig/doc/makefiles/Makefile.am libmng-1.0.5/doc/makefiles/Makefile.am
+--- libmng-1.0.5.orig/doc/makefiles/Makefile.am	Thu Jan  1 01:00:00 1970
++++ libmng-1.0.5/doc/makefiles/Makefile.am	Tue Mar  4 09:25:11 2003
+@@ -0,0 +1,4 @@
++## Process this file with automake to produce Makefile.in
++
++SUBDIRS = man
++
+diff -Nru libmng-1.0.5.orig/doc/man/makefiles/Makefile.am libmng-1.0.5/doc/man/makefiles/Makefile.am
+--- libmng-1.0.5.orig/doc/man/makefiles/Makefile.am	Thu Jan  1 01:00:00 1970
++++ libmng-1.0.5/doc/man/makefiles/Makefile.am	Tue Mar  4 09:25:11 2003
+@@ -0,0 +1,3 @@
++## Process this file with automake to produce Makefile.in
++
++man_MANS = libmng.3 jng.5 mng.5

Added: csw/mgar/pkg/libmng/trunk/files/libmng-gcc4.patch
===================================================================
--- csw/mgar/pkg/libmng/trunk/files/libmng-gcc4.patch	                        (rev 0)
+++ csw/mgar/pkg/libmng/trunk/files/libmng-gcc4.patch	2013-06-05 09:54:01 UTC (rev 21276)
@@ -0,0 +1,28 @@
+GCC-4 fix:
+
+mng.c: In function 'copyline':
+mng.c:233: error: invalid lvalue in increment
+mng.c:270: error: invalid lvalue in increment
+
+--- libmng-1.0.10/contrib/gcc/fbmngplay/mng.c.orig	2003-12-07 10:45:15.000000000 +0100
++++ libmng-1.0.10/contrib/gcc/fbmngplay/mng.c	2007-07-16 19:47:18.272161096 +0200
+@@ -230,7 +230,8 @@
+ 		a = a * mymng->alpha / 100;
+ 		switch (mymng->fbbpp) {
+ 		case 16:
+-			input = *((unsigned short *) background)++;
++			input = *(unsigned short *)background;
++			background += 2;
+ 			br = (input >> 8) & 0xf8;
+ 			bg = (input >> 3) & 0xfc;
+ 			bb = input << 3 & 0xff;
+@@ -267,7 +268,8 @@
+ 			b >>= 3;
+ 
+ 			output = (r << 11) | (g << 5) | b;
+-			*((unsigned short *) dest)++ = output;
++			*(unsigned short *)dest = output;
++			dest += 2;
+ 			break;
+ 		case 24:
+ 			*dest++ = b;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list