Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add package vtk7 #1279

Closed
wants to merge 7 commits into from
Closed

Add package vtk7 #1279

wants to merge 7 commits into from

Conversation

muellni
Copy link
Contributor

@muellni muellni commented Mar 31, 2016

Similar to vtk6, but this one builds against Qt5. It also uses mxe's CMake package.
I tested it with i686-w64-mingw32.static and i686-w64-mingw32.shared.

@@ -8,8 +8,7 @@ $(PKG)_CHECKSUM := 92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9
$(PKG)_SUBDIR := cmake-$($(PKG)_VERSION)
$(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
$(PKG)_TARGETS := $(BUILD)
$(PKG)_DEPS :=
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need this change?

When I first added cmake as a dependency to vtk7 it didn't work. But now I try to reproduce the error and it's gone, so I guess this change isn't needed at all.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need this change?

So right before the vtk7 package the error triggered:
make: *** No rule to make target '.../mxe/usr/i686-w64-mingw32.static/installed/cmake', needed by '.../mxe/usr/i686-w64-mingw32.static/installed/vtk7'. Stop.

This change made it build, but I don't know what it does.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove cmake from $(PKG)_DEPS := gcc hdf5 qtbase qttools libpng expat libxml2 jsoncpp cmake tiff
All cross-compiled packages depend on all native packages implicitly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove cmake from $(PKG)_DEPS

done at 32c3e47

All cross-compiled packages depend on all native packages implicitly.

good to know

@starius
Copy link
Member

starius commented Apr 7, 2016

Please remove trailing whitespaces added by you to several files.

@starius
Copy link
Member

starius commented Apr 7, 2016

We have packages vtk and vtk6. New one is vtk7. Maybe we should rename vtk to vtk5?

@muellni
Copy link
Contributor Author

muellni commented Apr 8, 2016

Please remove trailing whitespaces added by you to several files.

I only found two places, which I now removed in 7c3142a. Did I miss more?

@muellni
Copy link
Contributor Author

muellni commented Apr 8, 2016

We have packages vtk and vtk6. New one is vtk7. Maybe we should rename vtk to vtk5?

I agree that three VTK packages are too many.
We could simplify it into a vtk-qt4 and vtk-qt5 package (both version 7).
Maybe this depends on what people actually use. Are there package usage statistics?

@starius
Copy link
Member

starius commented Apr 8, 2016

The package vmime is broken: https://gist.github.com/28829db4c1246a844fb1ee4ec3e28af2

@tonytheodore
Copy link
Member

The package vmime is broken

From memory, the .pc file is recreated during build and the replacements need to happen after (untested):

diff --git a/src/vmime.mk b/src/vmime.mk
index 411b140..a14fde5 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -36,9 +36,9 @@ define $(PKG)_BUILD
         .

     $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(1)' install
     $(SED) -i 's,^\(Libs.private:.* \)$(PREFIX)/$(TARGET)/lib/libiconv\.a,\1-liconv,g' $(1)/vmime.pc
     $(if $(BUILD_STATIC),$(SED) -i 's/^\(Cflags:.* \)/\1 -DVMIME_STATIC /g' $(1)/vmime.pc)
-    $(MAKE) -C '$(1)' install
     $(if $(BUILD_SHARED),$(INSTALL) -m644 '$(1)/build/bin/libvmime.dll' '$(PREFIX)/$(TARGET)/bin/')

     $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp'

Are there package usage statistics?

There aren't any usage statistics, but VTK5 is heavily patched and unable to be easily updated. I'd prefer to drop this package (and switch it's downstream pcl to something newer).

@starius
Copy link
Member

starius commented Apr 9, 2016

The patch doesn't fix the vmime failure: https://gist.github.com/a6cb3073310339abf53248345bb8064f

The problem is related to missing vmime/export-shared.hpp file.

See also #1193 (previous attempt to update cmake). It has patches for vmime and other packages.

@starius
Copy link
Member

starius commented Apr 9, 2016

Can you move update of cmake to a separate pull request, please?

@tonytheodore
Copy link
Member

The patch doesn't fix the vmime failure

Of course! It's modifying the *.pc files in the build tree, not the installed version.

Can you try with $(PREFIX)/$(TARGET)/lib/pkgconfig/vmime.pc? Setting -DVMIME_STATIC skips the inclusion of vmime/export-shared.hpp. (I don't have reasonable build machine at the moment).

Can you move update of cmake to a separate pull request, please?

+1

starius pushed a commit to LuaAndC/mxe that referenced this pull request Apr 9, 2016
@starius
Copy link
Member

starius commented Apr 9, 2016

I moved vmime related changes to #1287
It works with both cmake versions.

@muellni muellni mentioned this pull request Apr 10, 2016
@muellni
Copy link
Contributor Author

muellni commented Apr 10, 2016

I'm going to create a new pull request which replaces packages vtk and vtk6. You can close this pull request if you agree.

@starius starius closed this Apr 11, 2016
@muellni muellni mentioned this pull request Apr 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants