Bug 202804 - [PATCH] x11/virtualgl: Update to 2.4.1
Summary: [PATCH] x11/virtualgl: Update to 2.4.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Kurt Jaeger
URL:
Keywords: patch, patch-ready
Depends on:
Blocks:
 
Reported: 2015-09-01 03:22 UTC by Ultima
Modified: 2015-10-19 19:30 UTC (History)
3 users (show)

See Also:
pi: maintainer-feedback+


Attachments
patch (7.37 KB, patch)
2015-09-01 03:22 UTC, Ultima
no flags Details | Diff
Fixed patch (7.05 KB, patch)
2015-09-01 18:13 UTC, Ultima
no flags Details | Diff
Another fixed patch (8.44 KB, patch)
2015-09-02 02:44 UTC, Ultima
no flags Details | Diff
improved virtualgl update patch (8.72 KB, patch)
2015-10-14 03:02 UTC, Matthew Rezny
no flags Details | Diff
102amd64-poudriere.log (65.93 KB, patch)
2015-10-14 14:30 UTC, Ultima
no flags Details | Diff
x11/virtualgl update to 2.4.1 (8.92 KB, patch)
2015-10-16 22:37 UTC, Matthew Rezny
no flags Details | Diff
x11/virtualgl update to 2.4.1 (9.00 KB, patch)
2015-10-16 23:00 UTC, Matthew Rezny
koobs: maintainer-approval? (davidjx8p)
Details | Diff
102amd64-poudriere.log (195.30 KB, text/x-log)
2015-10-16 23:02 UTC, Ultima
no flags Details
102i386-poudriere.log (195.23 KB, text/x-log)
2015-10-16 23:03 UTC, Ultima
no flags Details
93amd64-poudriere.log (196.95 KB, text/x-log)
2015-10-16 23:03 UTC, Ultima
no flags Details
93i386-poudriere.log (191.06 KB, text/x-log)
2015-10-16 23:03 UTC, Ultima
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Ultima 2015-09-01 03:22:29 UTC
Created attachment 160573 [details]
patch

This patch upgrades x11/virtualgl to its latest release 2.4.1
Comment 1 Ultima 2015-09-01 18:13:42 UTC
Created attachment 160603 [details]
Fixed patch

My last patch broke i386. This patch is the fixed version.
Comment 2 David Mackay 2015-09-02 01:43:00 UTC
I was about to note that the missing handling for vboxspheres(64) seemed to be a regression, but with that fixed in the updated patch, this looks good to me.

I'll make sure this works on the various versions - I can't imagine it should be problematic, in any case - and then it looks good for merging.
Comment 3 Ultima 2015-09-02 02:44:37 UTC
Created attachment 160615 [details]
Another fixed patch

I'm still learning how to use svnlite. One of the patches are suppose to be removed and a new file added. I found svnlite add/remove works then using diff will show it on the patch, however when I apply the patch it gives me an error about a conflict. I'm not sure what I did wrong but this is yet another patch xD. If someone could point me in the right direction that would be great =D
Comment 4 David Mackay 2015-09-16 00:56:49 UTC
(In reply to Ultima from comment #3)
Looks good to me - have tested and it appears to work correctly. Ready to integrate.
Comment 5 Matthew Rezny freebsd_committer freebsd_triage 2015-10-14 03:02:29 UTC
Created attachment 162006 [details]
improved virtualgl update patch

I also started working on an update to this port and took it a bit further. My patch is attached.

The additions:

* Patch for Socket.h to complement the patch to Socket.cpp, all previous versions of the port miss this. The default value in the cpp was incorrect, but without moving te default value to the proper place, the header, previous patches changed behavior be making the value undefined when that variable is omitted in a function call.

* Use the system FLTK explicitly instead of the old bundled version. Build can fail if FLTK is already installed on the system and the bundled lib was expected. Better to explicitly and always use the newer FLTK from ports.

* Enable FAKEXCB to allow Qt5 to work properly. Required adding LD_FLAGS.

* Explicitly use gl as well as glu, build instructions explicitly mention both libGL and libGLU are required.
Comment 6 Ultima 2015-10-14 14:30:58 UTC
Created attachment 162040 [details]
102amd64-poudriere.log

The new patch failed to build.
Comment 7 Matthew Rezny freebsd_committer freebsd_triage 2015-10-16 22:37:27 UTC
Created attachment 162132 [details]
x11/virtualgl update to 2.4.1

Ultima found a missing dependency. Patch has been updated to add it.
Comment 8 Matthew Rezny freebsd_committer freebsd_triage 2015-10-16 23:00:08 UTC
Created attachment 162133 [details]
x11/virtualgl update to 2.4.1

Seems it also needs a newer compiler on 9.3, added compiler:c++11-lang to USES.
Comment 9 Ultima 2015-10-16 23:02:43 UTC
Created attachment 162134 [details]
102amd64-poudriere.log
Comment 10 Ultima 2015-10-16 23:03:01 UTC
Created attachment 162135 [details]
102i386-poudriere.log
Comment 11 Ultima 2015-10-16 23:03:20 UTC
Created attachment 162136 [details]
93amd64-poudriere.log
Comment 12 Ultima 2015-10-16 23:03:38 UTC
Created attachment 162137 [details]
93i386-poudriere.log
Comment 13 commit-hook freebsd_committer freebsd_triage 2015-10-19 19:28:44 UTC
A commit references this bug:

Author: pi
Date: Mon Oct 19 19:27:45 UTC 2015
New revision: 399713
URL: https://svnweb.freebsd.org/changeset/ports/399713

Log:
  x11/virtualgl: 2.3.3 -> 2.4.1

  Changes:
    https://github.com/VirtualGL/virtualgl/blob/master/ChangeLog.txt

  PR:		202804
  Submitted by:	Ultima1252@gmail.com, matthew@reztek.cz
  Approved by:	David Mackay <davidjx8p@gmail.com> (maintainer)

Changes:
  head/x11/virtualgl/Makefile
  head/x11/virtualgl/distinfo
  head/x11/virtualgl/files/patch-common__CMakeLists.txt
  head/x11/virtualgl/files/patch-include_Socket.h
  head/x11/virtualgl/files/patch-server__CMakeLists.txt
  head/x11/virtualgl/files/patch-util_Socket.cpp
  head/x11/virtualgl/files/patch-util__CMakeLists.txt
  head/x11/virtualgl/files/patch-util__rrsocket.cpp
  head/x11/virtualgl/pkg-plist
Comment 14 Kurt Jaeger freebsd_committer freebsd_triage 2015-10-19 19:30:28 UTC
I did my own test-builds, all looks fine, thanks very much! Committed.