[med-svn] [conquest-dicom-server] 03/30: Some progress

[Pablo Lorenzzoni]

This is an automated email from the git hooks/post-receive script.

spectra pushed a commit to branch master
in repository conquest-dicom-server.

commit 8471ec9b08134b8214049c78bb00fb3a68729320
Author: Mathieu Malaterre <malat at debian.org>
Date:   Wed Jul 4 16:20:43 2012 +0000

    Some progress
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-med/trunk/packages/conquest-dicom-server/trunk@11545 d8681a01-af0d-0410-a158-b4166a59cfaa
---
 debian/TODO            | 1 +
 debian/get-orig-source | 2 +-
 debian/rules           | 9 +++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..d02f6a7
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1 @@
+I do not think we can use system jasper since it will load jpeg in our back and symbols will conflicts with the lossless jpeg implementation
diff --git a/debian/get-orig-source b/debian/get-orig-source
index c514094..2b8de99 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -18,7 +18,7 @@ tar xvf ${UPSTREAM} -C ${FOLDER}
 # conv copy of libjasper (sigh)
 rm -rf ${FOLDER}/jasper-1.900.1-6ct/
 # conv copy of libjpeg 6c:
-rm -rf ${FOLDER}/jpeg-6c/
+#rm -rf ${FOLDER}/jpeg-6c/
 # conv copy of lua 5.1.4
 rm -rf ${FOLDER}/lua_5.1.4/
 # conv copy of sqlite3
diff --git a/debian/rules b/debian/rules
index 09fb10f..b4c4adc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,13 @@
 %:
 	dh $@ --parallel
 
-dgate:
-	g++ $(CPPFLAGS) $(CXXFLAGS) -I/usr/include/lua5.1 -DUNIX -DNATIVE_ENDIAN=1 -DHAVE_LIBJASPER -DHAVE_LIBJPEG -DUSESQLITE -Wno-write-strings total.cpp -o dgate -lpthread -ldl -ljasper -ljpeg -Wno-multichar $(LDFLAGS)
+jpeg-6c/libjpeg.a:
+	cd jpeg-6c/
+	./configure
+	make
+
+dgate: jpeg-6c/libjpeg.a
+	g++ $(CPPFLAGS) $(CXXFLAGS) -Ijpeg-6c -I/usr/include/lua5.1 -DUNIX -DNATIVE_ENDIAN=1 -DHAVE_LIBJASPER -DHAVE_LIBJPEG -DUSESQLITE -Wno-write-strings total.cpp -o dgate -lpthread -ldl -ljasper -llua5.1 -lsqlite3 jpeg-6c/libjpeg.a -Wno-multichar $(LDFLAGS)
 
 override_dh_auto_build: dgate
 	cp dicom.ini.sqlite dicom.ini

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git