Commit 615f604d authored by Andreas Metzler's avatar Andreas Metzler

Drop -mp variants.

As --enable-image-cache is not supported anymore, there is no reason for
building twice (with image-cache and with OpenMP). enblend-mp and
enfuse-mp are therefore not shipped anymore as this functionality is
available in the binaries without -mp suffix.
parent 1c15c545
...@@ -5,6 +5,10 @@ enblend-enfuse (4.2-1) UNRELEASED; urgency=medium ...@@ -5,6 +5,10 @@ enblend-enfuse (4.2-1) UNRELEASED; urgency=medium
debian/patches-repack/ and debian/bin/uscan_repack.sh, update debian/patches-repack/ and debian/bin/uscan_repack.sh, update
debian/watch. debian/watch.
* Rename build-directory from build-no-mp to build-def. * Rename build-directory from build-no-mp to build-def.
* As --enable-image-cache is not supported anymore, there is no reason for
building twice (with image-cache and with OpenMP). enblend-mp and
enfuse-mp are therefore not shipped anymore as this functionality is
available in the binaries without -mp suffix.
-- Andreas Metzler <ametzler@debian.org> Sat, 02 Apr 2016 08:55:45 +0200 -- Andreas Metzler <ametzler@debian.org> Sat, 02 Apr 2016 08:55:45 +0200
......
../../build-def/doc/enblend.pdf usr/share/doc/enblend ../../build-def/doc/enblend.pdf usr/share/doc/enblend
usr/bin/enblend usr/bin/enblend
usr/bin/enblend-mp
usr/share/info/enblend.info usr/share/info/enblend.info
usr/share/man/man1/enblend.1 usr/share/man/man1/enblend.1
../../build-def/doc/enfuse.pdf usr/share/doc/enfuse ../../build-def/doc/enfuse.pdf usr/share/doc/enfuse
usr/bin/enfuse usr/bin/enfuse
usr/bin/enfuse-mp
usr/share/info/enfuse.info usr/share/info/enfuse.info
usr/share/man/man1/enfuse.1 usr/share/man/man1/enfuse.1
...@@ -15,37 +15,22 @@ export DEB_CXXFLAGS_MAINT_APPEND := -pipe ...@@ -15,37 +15,22 @@ export DEB_CXXFLAGS_MAINT_APPEND := -pipe
export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS := hardening=+all export DEB_BUILD_MAINT_OPTIONS := hardening=+all
CONFARGS:=--enable-gpu-support=yes \ CONFARGS := --with-openexr=yes
--with-boost-filesystem=yes \
--with-openexr=yes
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure --verbose \ dh_auto_configure --verbose \
--builddirectory=build-def -- $(CONFARGS) \ --builddirectory=build-def -- $(CONFARGS) \
--disable-openmp \ --enable-openmp
--enable-image-cache=yes
dh_auto_configure --verbose \
--builddirectory=build-tree-mp -- $(CONFARGS) \
--enable-openmp \
--disable-image-cache
override_dh_auto_build: override_dh_auto_build:
dh_auto_build --verbose --parallel --builddirectory=build-def dh_auto_build --verbose --parallel --builddirectory=build-def
cd build-def && $(MAKE) pdf cd build-def && $(MAKE) pdf
dh_auto_build --verbose --parallel --builddirectory=build-tree-mp
sed -i -e "s/manual page for enblend.*/combine images using a multiresolution spline/" \ sed -i -e "s/manual page for enblend.*/combine images using a multiresolution spline/" \
build-def/src/enblend.1 build-def/src/enblend.1
sed -i -e "s/manual page for enfuse.*/poor man's HDR/" \ sed -i -e "s/manual page for enfuse.*/poor man's HDR/" \
build-def/src/enfuse.1 build-def/src/enfuse.1
override_dh_auto_install:
dh_auto_install --verbose --builddirectory=build-def
install -m755 build-tree-mp/src/enblend \
$(CURDIR)/debian/tmp/usr/bin/enblend-mp
install -m755 build-tree-mp/src/enfuse \
$(CURDIR)/debian/tmp/usr/bin/enfuse-mp
override_dh_compress: override_dh_compress:
dh_compress -X.pdf dh_compress -X.pdf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment