From 411cfb6ba54e3af003e8251891e82175d8ba65c3 Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Wed, 23 Dec 2009 22:33:39 +0100 Subject: [PATCH 1/2] improved solution to avoid redefinition of INT32 in package jpeg --- src/jpeg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jpeg.mk b/src/jpeg.mk index 49b20c47..798fc05e 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -38,7 +38,7 @@ endef define $(PKG)_BUILD # avoid redefinition of INT32 - $(SED) 's,#ifndef XMD_H,#if (!defined(XMD_H) \&\& !defined(_BASETSD_H)),' -i '$(1)/jmorecfg.h' + $(SED) 's,typedef long INT32;,#include ,' -i '$(1)/jmorecfg.h' cd '$(1)' && ./configure \ CC='$(TARGET)-gcc' RANLIB='$(TARGET)-ranlib' \ --disable-shared \ From f768966dd315aac5cf7808d7f16ae0519813241e Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Wed, 23 Dec 2009 23:14:30 +0100 Subject: [PATCH 2/2] new package: libpano13 (by Bart van Andel) --- src/libpano13.mk | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/libpano13.mk diff --git a/src/libpano13.mk b/src/libpano13.mk new file mode 100644 index 00000000..59447f97 --- /dev/null +++ b/src/libpano13.mk @@ -0,0 +1,55 @@ +# Copyright (C) 2009 Volker Grabsch +# Bart van Andel +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject +# to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# libpano13 +PKG := libpano13 +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.9.15_beta3 +$(PKG)_CHECKSUM := 963a7c18b57144b174df063031ed376133a6e522 +$(PKG)_SUBDIR := libpano13-$(word 1,$(subst _, ,$($(PKG)_VERSION))) +$(PKG)_FILE := libpano13-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://panotools.sourceforge.net/ +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/panotools/libpano13/libpano13-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc jpeg tiff libpng zlib + +define $(PKG)_UPDATE + wget -q -O- 'http://sourceforge.net/api/file/index/project-id/96188/rss?path=/libpano13' | \ + grep '/download' | \ + $(SED) -n 's,.*libpano13-\([0-9].*\)\.tar.*,\1,p' | \ + tail -1 +endef + +define $(PKG)_BUILD + $(SED) 's,WINDOWSX\.H,windowsx.h,' -i '$(1)/sys_win.h' + $(SED) 's,\$${WINDRES-windres},$(TARGET)-windres,' -i '$(1)/build/win32/compile-resource' + $(SED) 's,m4 -DBUILDNUMBER=\$$buildnumber,$(SED) "s/BUILDNUMBER/\$$buildnumber/g",' -i '$(1)/build/win32/compile-resource' + $(SED) 's,mv.*libpano13\.dll.*,,' -i '$(1)/Makefile.in' + cd '$(1)' && ./configure \ + --prefix='$(PREFIX)/$(TARGET)' \ + --host='$(TARGET)' \ + --disable-shared \ + --with-jpeg='$(PREFIX)/$(TARGET)'/lib \ + --with-tiff='$(PREFIX)/$(TARGET)'/lib \ + --with-png='$(PREFIX)/$(TARGET)'/lib \ + --with-zlib='$(PREFIX)/$(TARGET)'/lib + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= +endef