From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 557eba921469aac7388d9571522f332c86e087cb
Date: Sun, 13 Jan 2013 03:28:44 +0100 [thread overview]
Message-ID: <20130113022845.30F9520161@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6605 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 557eba921469aac7388d9571522f332c86e087cb (commit)
via f6ff3b4a4c00b5d168a437b1a20249086a99ccea (commit)
from 6ba1bd0031fe2b77a69e441d5da0bb3dfdd07ed6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 557eba921469aac7388d9571522f332c86e087cb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 13 03:28:21 2013 +0100
ipfire-logos: Update to version 3.
commit f6ff3b4a4c00b5d168a437b1a20249086a99ccea
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 13 00:51:26 2013 +0100
netpbm: New package.
A library for handing different graphics file formats.
-----------------------------------------------------------------------
Summary of changes:
ipfire-logos/ipfire-logos.nm | 3 +-
netpbm/netpbm.nm | 80 +++++++++++++++++++++++++++++++++
netpbm/patches/netpbm-noppmtompeg.patch | 23 ++++++++++
netpbm/svn-export.sh | 26 +++++++++++
4 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 netpbm/netpbm.nm
create mode 100644 netpbm/patches/netpbm-noppmtompeg.patch
create mode 100644 netpbm/svn-export.sh
Difference in files:
diff --git a/ipfire-logos/ipfire-logos.nm b/ipfire-logos/ipfire-logos.nm
index c1e8bd3..e435087 100644
--- a/ipfire-logos/ipfire-logos.nm
+++ b/ipfire-logos/ipfire-logos.nm
@@ -4,7 +4,7 @@
###############################################################################
name = ipfire-logos
-version = 2
+version = 3
release = 1
arch = noarch
@@ -25,6 +25,7 @@ build
requires
ImageMagick
ghostscript
+ netpbm-progs
end
end
diff --git a/netpbm/netpbm.nm b/netpbm/netpbm.nm
new file mode 100644
index 0000000..e06d5a0
--- /dev/null
+++ b/netpbm/netpbm.nm
@@ -0,0 +1,80 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = netpbm
+version = 10.61.01
+release = 1
+
+groups = System/Libraries
+url = http://netpbm.sourceforge.net/
+license = BSD and GPLv2 and IJG and MIT and Public Domain
+summary = A library for handling different graphics file formats.
+
+description
+ The netpbm package contains a library of functions which support
+ programs for handling various graphics file formats, including .pbm
+ (portable bitmaps), .pgm (portable graymaps), .pnm (portable anymaps),
+ .ppm (portable pixmaps) and others.
+end
+
+build
+ requires
+ flex
+ libjpeg-devel
+ libpng-devel
+ libtiff-devel
+ libX11-devel
+ libxml2-devel
+ perl
+ end
+
+ prepare_cmds
+ #sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
+ #rm -rf converter/other/jpeg2000/libjasper/
+ #sed -i -e 's/^SUBDIRS = libjasper/SUBDIRS =/' converter/other/jpeg2000/Makefile
+ end
+
+ build
+ yes "" | ./configure
+
+ make \
+ LDFLAGS="-L$(pwd)/pbm -L$(pwd)/pgm -L$(pwd)/pnm -L$(pwd)/ppm" \
+ CFLAGS="%{CFLAGS} -flax-vector-conversions -fno-strict-aliasing" \
+ LADD="-lm" \
+ LINUXSVGALIB="NONE"
+ end
+
+ install
+ make package pkgdir=%{BUILDROOT}%{prefix} LINUXSVGALIB="NONE" XML2LIBS="NONE"
+
+ # Ugly hack to have libs in correct dir on 64bit archs.
+ mkdir -p %{BUILDROOT}%{libdir}
+ if [ "%{libdir}" != "/usr/lib" ]; then
+ mv %{BUILDROOT}/usr/lib/lib* %{BUILDROOT}%{libdir}
+ fi
+ ln -svf libnetpbm.so.11 %{BUILDROOT}%{libdir}/libnetpbm.so
+
+ rm -rvf %{BUILDROOT}%{prefix}/{README,VERSION,link,misc,man,pkginfo,config_template}
+ rm -rvf %{BUILDROOT}%{bindir}/doc.url
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-progs
+ files
+ %{bindir}
+ end
+ end
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/netpbm/patches/netpbm-noppmtompeg.patch b/netpbm/patches/netpbm-noppmtompeg.patch
new file mode 100644
index 0000000..58b7fa8
--- /dev/null
+++ b/netpbm/patches/netpbm-noppmtompeg.patch
@@ -0,0 +1,23 @@
+diff -up netpbm-10.47.12/buildtools/manpage.mk.noppmtompeg netpbm-10.47.12/buildtools/manpage.mk
+--- netpbm-10.47.12/buildtools/manpage.mk.noppmtompeg 2010-04-27 09:54:52.121522491 -0400
++++ netpbm-10.47.12/buildtools/manpage.mk 2010-04-27 09:55:10.337642487 -0400
+@@ -251,7 +251,6 @@ MAN1 = \
+ ppmtolj.1 \
+ ppmtomap.1 \
+ ppmtomitsu.1 \
+- ppmtompeg.1 \
+ ppmtoneo.1 \
+ ppmtopcx.1 \
+ ppmtopgm.1 \
+diff -up netpbm-10.47.12/converter/ppm/Makefile.noppmtompeg netpbm-10.47.12/converter/ppm/Makefile
+--- netpbm-10.47.12/converter/ppm/Makefile.noppmtompeg 2010-04-27 09:55:20.293517254 -0400
++++ netpbm-10.47.12/converter/ppm/Makefile 2010-04-27 09:55:41.534642567 -0400
+@@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
+
+ include $(BUILDDIR)/config.mk
+
+-SUBDIRS = hpcdtoppm ppmtompeg
++SUBDIRS = hpcdtoppm
+
+ PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
+ leaftoppm mtvtoppm neotoppm \
diff --git a/netpbm/svn-export.sh b/netpbm/svn-export.sh
new file mode 100644
index 0000000..a6ce1be
--- /dev/null
+++ b/netpbm/svn-export.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+version=${1}
+
+if [ -z "${version}" ]; then
+ echo >&2 "No version!"
+ exit 1
+fi
+
+export_dir="netpbm-${version}"
+rm -rf ${export_dir}
+
+set -x
+
+svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced ${export_dir}
+svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide ${export_dir}/userguide
+svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/trunk/test ${export_dir}/test
+find ${export_dir} -name "\.svn" -type d -print0 | xargs -0 rm -rvf
+
+# removing the ppmtompeg code, due to patents
+rm -rf ${export_dir}/converter/ppm/ppmtompeg/
+
+tar cfz netpbm-${version}.tar.gz ${export_dir}
+rm -rf ${export_dir}
+
+exit 0
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2013-01-13 2:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130113022845.30F9520161@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox