Commit 8a859cc5 authored by Andreas Metzler's avatar Andreas Metzler

Refresh patches for 4.2.

Drop patches-repack/01-unnecessary-libs.patch, refresh
debian/patches-repack/00-win32helpers.patch.
parent 075d2b74
enblend-enfuse (4.2-1) UNRELEASED; urgency=medium
* New upstream version.
+ Drop patches-repack/01-unnecessary-libs.patch, refresh
debian/patches-repack/00-win32helpers.patch.
-- Andreas Metzler <ametzler@debian.org> Sat, 02 Apr 2016 08:55:45 +0200
......
diff -NurBbp a/configure.ac enblend-enfuse-4.1.4/configure.ac
--- a/configure.ac 2015-08-07 16:44:45.000000000 +0200
+++ enblend-enfuse-4.1.4/configure.ac 2015-10-03 13:15:23.467319893 +0200
@@ -555,7 +555,6 @@ AC_CONFIG_FILES([Makefile
include/vigra_ext/Makefile
diff -NurBbp enblend-enfuse-4.2.orig/configure.ac enblend-enfuse-4.2/configure.ac
--- enblend-enfuse-4.2.orig/configure.ac 2016-03-28 11:44:02.000000000 +0200
+++ enblend-enfuse-4.2/configure.ac 2016-04-02 08:49:36.209630154 +0200
@@ -550,8 +550,7 @@ AC_CONFIG_FILES([doc/Makefile
AC_CONFIG_FILES([Makefile
src/Makefile
src/layer_selection/Makefile
- src/win32helpers/Makefile
doc/Makefile])
src/dynamic_loader/Makefile
- src/layer_selection/Makefile
- src/win32helpers/Makefile])
+ src/layer_selection/Makefile])
AC_OUTPUT
diff -NurBbp a/src/Makefile.am enblend-enfuse-4.1.4/src/Makefile.am
--- a/src/Makefile.am 2013-10-07 09:55:37.000000000 +0200
+++ enblend-enfuse-4.1.4/src/Makefile.am 2015-10-03 13:15:23.467319893 +0200
AC_MSG_RESULT([
diff -NurBbp enblend-enfuse-4.2.orig/src/Makefile.am enblend-enfuse-4.2/src/Makefile.am
--- enblend-enfuse-4.2.orig/src/Makefile.am 2015-12-19 16:10:51.000000000 +0100
+++ enblend-enfuse-4.2/src/Makefile.am 2016-04-02 08:49:49.225451005 +0200
@@ -3,7 +3,7 @@ AM_CFLAGS = $(EXTRACFLAGS)
AM_CXXFLAGS = $(EXTRACXXFLAGS)
AM_LDFLAGS = $(EXTRALDFLAGS)
-SUBDIRS = layer_selection win32helpers
+SUBDIRS = layer_selection
-SUBDIRS = dynamic_loader layer_selection win32helpers
+SUBDIRS = dynamic_loader layer_selection
bin_PROGRAMS = enblend enfuse
diff -NurbBp a/m4/ax_check_glut.m4 b/m4/ax_check_glut.m4
--- a/m4/ax_check_glut.m4 2009-09-06 15:14:31.000000000 +0200
+++ b/m4/ax_check_glut.m4 2009-12-20 14:23:34.000000000 +0100
@@ -72,12 +72,6 @@ m4_define([AX_CHECK_GLUT_PROGRAM],
# endif]],
[[glutMainLoop()]])])
-#
-# If X is present, assume GLUT depends on it.
-#
-AS_IF([test X$no_x != Xyes],
- [GLUT_LIBS="${X_PRE_LIBS} -lXmu -lXi ${X_EXTRA_LIBS} ${GLUT_LIBS}"])
-
AC_CACHE_CHECK([for GLUT library], [ax_cv_check_glut_libglut],
[ax_cv_check_glut_libglut="no"
AC_LANG_PUSH(C)
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