Add one patch to build on FreeBSD, one to allow parallel make (thus drop forcing -j1), and one to avoid adding extra compiler flags.

(Portage version: 2.1_rc2-r3)

6 files changed, 89 insertions, 5 deletions

diff --git a/media-libs/exscalibar/ChangeLog b/media-libs/exscalibar/ChangeLog
index 396d24657e17..bf798cdb06b0 100644
--- a/media-libs/exscalibar/ChangeLog
+++ b/media-libs/exscalibar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/exscalibar
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/ChangeLog,v 1.7 2006/04/17 20:21:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/ChangeLog,v 1.8 2006/05/27 12:25:25 flameeyes Exp $
+
+  27 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/exscalibar-1.0.4-fbsd.patch,
+  +files/exscalibar-1.0.4-noextraflags.patch,
+  +files/exscalibar-1.0.4-parallelmake.patch, exscalibar-1.0.4.ebuild:
+  Add one patch to build on FreeBSD, one to allow parallel make (thus drop
+  forcing -j1), and one to avoid adding extra compiler flags.
 
   17 Apr 2006; Markus Rothe <corsair@gentoo.org> exscalibar-1.0.4.ebuild:
   Added ~ppc64; bug #129409
diff --git a/media-libs/exscalibar/exscalibar-1.0.4.ebuild b/media-libs/exscalibar/exscalibar-1.0.4.ebuild
index 6d9e3fdf878d..eac2a983f824 100644
--- a/media-libs/exscalibar/exscalibar-1.0.4.ebuild
+++ b/media-libs/exscalibar/exscalibar-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/exscalibar-1.0.4.ebuild,v 1.8 2006/04/17 20:21:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/exscalibar-1.0.4.ebuild,v 1.9 2006/05/27 12:25:25 flameeyes Exp $
 
 inherit eutils qt3
 
@@ -24,8 +24,11 @@ DEPEND="$(qt_min_version 3.2)
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/exscalibar-configure-disable-features.diff
-	epatch ${FILESDIR}/exscalibar-1.0.4-gcc4-amd64.diff
+	epatch "${FILESDIR}/exscalibar-configure-disable-features.diff"
+	epatch "${FILESDIR}/exscalibar-1.0.4-gcc4-amd64.diff"
+	epatch "${FILESDIR}/${P}-fbsd.patch"
+	epatch "${FILESDIR}/${P}-parallelmake.patch"
+	epatch "${FILESDIR}/${P}-noextraflags.patch"
 }
 
 src_compile () {
@@ -41,7 +44,7 @@ src_compile () {
 	./configure || die "configure failed"
 	echo "QMAKE_CFLAGS_RELEASE = ${CFLAGS}" >> global.pro
 	echo "QMAKE_CXXFLAGS_RELEASE = ${CXXFLAGS}" >> global.pro
-	emake -j1 || die "emake failed"
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/media-libs/exscalibar/files/digest-exscalibar-1.0.4 b/media-libs/exscalibar/files/digest-exscalibar-1.0.4
index f176729caeda..8d782a6ee68c 100644
--- a/media-libs/exscalibar/files/digest-exscalibar-1.0.4
+++ b/media-libs/exscalibar/files/digest-exscalibar-1.0.4
@@ -1 +1,3 @@
 MD5 3b0abeb7648d3732e5f4702c4a2be4ab exscalibar-1.0.4.tar.bz2 230962
+RMD160 cebb089881c674e7ad472ad40d822e8fc30b8e7c exscalibar-1.0.4.tar.bz2 230962
+SHA256 7553305c140311d499f98bdae08787d0ff5e0e4ccdc2596fc604a727d087f78a exscalibar-1.0.4.tar.bz2 230962
diff --git a/media-libs/exscalibar/files/exscalibar-1.0.4-fbsd.patch b/media-libs/exscalibar/files/exscalibar-1.0.4-fbsd.patch
new file mode 100644
index 000000000000..5f54fab22a7c
--- /dev/null
+++ b/media-libs/exscalibar/files/exscalibar-1.0.4-fbsd.patch
@@ -0,0 +1,19 @@
+Index: exscalibar-1.0.4/src/qtextra/qsocketsession.h
+===================================================================
+--- exscalibar-1.0.4.orig/src/qtextra/qsocketsession.h
++++ exscalibar-1.0.4/src/qtextra/qsocketsession.h
+@@ -11,7 +11,13 @@
+ #define __QSOCKETSESSION_H
+ 
+ // TODO: may need compatibility fixes.
+-#include <byteswap.h>
++#ifdef __FreeBSD__
++# include <sys/endian.h>
++# define bswap_32 __bswap32
++# define bswap_16 __bswap16
++#else
++# include <byteswap.h>
++#endif
+ 
+ #include <stdint.h>
+ 
diff --git a/media-libs/exscalibar/files/exscalibar-1.0.4-noextraflags.patch b/media-libs/exscalibar/files/exscalibar-1.0.4-noextraflags.patch
new file mode 100644
index 000000000000..e796de7b888a
--- /dev/null
+++ b/media-libs/exscalibar/files/exscalibar-1.0.4-noextraflags.patch
@@ -0,0 +1,25 @@
+Index: exscalibar-1.0.4/global.tmpl
+===================================================================
+--- exscalibar-1.0.4.orig/global.tmpl
++++ exscalibar-1.0.4/global.tmpl
+@@ -30,20 +30,6 @@ gat:DEFINES += HAVE_GAT
+ gat:QMAKE_CXXFLAGS += $${GAT_CPPFLAGS}
+ gat:LIBS += $${GAT_LIBS}
+ 
+-QMAKE_CXXFLAGS_RELEASE += -DRELEASE \
+--g0 \
+--ffast-math \
+--fomit-frame-pointer \
+--pipe \
+--Os
+-QMAKE_CXXFLAGS_DEBUG += -DDEBUG \
+--g3 \
+--ffast-math \
+--fno-inline \
+--pipe \
+--O0 \
+--Wall
+-
+ CONFIG += release \
+ warn_on \
+ qt \
diff --git a/media-libs/exscalibar/files/exscalibar-1.0.4-parallelmake.patch b/media-libs/exscalibar/files/exscalibar-1.0.4-parallelmake.patch
new file mode 100644
index 000000000000..4beaecc02c89
--- /dev/null
+++ b/media-libs/exscalibar/files/exscalibar-1.0.4-parallelmake.patch
@@ -0,0 +1,28 @@
+Index: exscalibar-1.0.4/src/src.pro
+===================================================================
+--- exscalibar-1.0.4.orig/src/src.pro
++++ exscalibar-1.0.4/src/src.pro
+@@ -6,9 +6,10 @@
+ SUBDIRS += qtextra \
+            geddei \
+            processors \
+-           tests \
+            remote \
++           tests \
+            exinfo \
+            nite \
+            examples 
+ TEMPLATE = subdirs
++CONFIG += ordered
+Index: exscalibar-1.0.4/src/remote/remote.pro
+===================================================================
+--- exscalibar-1.0.4.orig/src/remote/remote.pro
++++ exscalibar-1.0.4/src/remote/remote.pro
+@@ -10,5 +10,7 @@ SUBDIRS += rgeddei \
+            nodeserver \
+            tests
+ 
++CONFIG += ordered
++
+ gat:SUBDIRS += nodecontroller
+