Author: malat Date: 2012-07-04 16:20:43 +0000 (Wed, 04 Jul 2012) New Revision: 11545
Added: trunk/packages/conquest-dicom-server/trunk/debian/TODO Modified: trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source trunk/packages/conquest-dicom-server/trunk/debian/rules Log: Some progress Added: trunk/packages/conquest-dicom-server/trunk/debian/TODO =================================================================== --- trunk/packages/conquest-dicom-server/trunk/debian/TODO (rev 0) +++ trunk/packages/conquest-dicom-server/trunk/debian/TODO 2012-07-04 16:20:43 UTC (rev 11545) @@ -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 Modified: trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source =================================================================== --- trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source 2012-07-04 16:10:46 UTC (rev 11544) +++ trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source 2012-07-04 16:20:43 UTC (rev 11545) @@ -18,7 +18,7 @@ # 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 Modified: trunk/packages/conquest-dicom-server/trunk/debian/rules =================================================================== --- trunk/packages/conquest-dicom-server/trunk/debian/rules 2012-07-04 16:10:46 UTC (rev 11544) +++ trunk/packages/conquest-dicom-server/trunk/debian/rules 2012-07-04 16:20:43 UTC (rev 11545) @@ -4,9 +4,14 @@ %: 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 cp dicom.sql.sqlite dicom.sql _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit