[128177] users/devans/GNOME-3/stable/dports/gnome

devans at macports.org devans at macports.org
Sat Nov 15 15:05:59 PST 2014


Revision: 128177
          https://trac.macports.org/changeset/128177
Author:   devans at macports.org
Date:     2014-11-15 15:05:59 -0800 (Sat, 15 Nov 2014)
Log Message:
-----------
GNOME-3/stable: gstreamer1-gst-plugins-bad, merge recent changes from trunk that fix build on darwin 10 and earlier.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile
    users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt
    users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile
    users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt
    users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/files/patch-opengl-10.6.diff

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile	2014-11-15 22:20:14 UTC (rev 128176)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile	2014-11-15 23:05:59 UTC (rev 128177)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            gnome3-apps
-version         3.14.1
+version         3.14.2
 categories      gnome
 license         Permissive
 maintainers     devans openmaintainer

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt	2014-11-15 22:20:14 UTC (rev 128176)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt	2014-11-15 23:05:59 UTC (rev 128177)
@@ -1,51 +1,51 @@
 apps:accerciser:3.14.0:
-apps:aisleriot:3.14.1:
+apps:aisleriot:3.14.2:
 apps:anjuta:3.14.0:
-apps:bijiben:3.14.1:
-apps:brasero:3.11.4:
-apps:cheese:3.14.1:
+apps:bijiben:3.14.2:
+apps:brasero:3.12.0:
+apps:cheese:3.14.2:
 apps:devhelp:3.14.0:
-apps:evolution:3.12.7:
-apps:file-roller:3.14.1:
+apps:evolution:3.12.8:
+apps:file-roller:3.14.2:
 apps:five-or-more:3.14.1:
-apps:four-in-a-row:3.14.1:
-apps:gedit:3.14.0:
+apps:four-in-a-row:3.14.2:
+apps:gedit:3.14.1:
 apps:gitg:3.14.0:
-apps:glade:3.18.3:
-apps:gnome-boxes:3.14.1.1:
-apps:gnome-chess:3.14.0:
+apps:glade:3.14.3:
+apps:gnome-boxes:3.14.2:
+apps:gnome-chess:3.14.1:
 apps:gnome-clocks:3.14.1:
-apps:gnome-color-manager:3.14.1:
-apps:gnome-devel-docs:3.14.1:
-apps:gnome-documents:3.14.0:
+apps:gnome-color-manager:3.14.2:
+apps:gnome-devel-docs:3.14.2:
+apps:gnome-documents:3.14.1:
 apps:gnome-getting-started-docs:3.14.1:
-apps:gnome-initial-setup:3.14.1:
-apps:gnome-klotski:3.14.1:
-apps:gnome-logs:3.14.1:
+apps:gnome-initial-setup:3.14.2.1:
+apps:gnome-klotski:3.14.2:
+apps:gnome-logs:3.14.2:
 apps:gnome-mahjongg:3.14.1:
-apps:gnome-maps:3.14.1.2:
+apps:gnome-maps:3.14.2:
 apps:gnome-mines:3.14.1:
-apps:gnome-music:3.14.1:
+apps:gnome-music:3.14.2:
 apps:gnome-nettool:3.8.1:
 apps:gnome-nibbles:3.14.1:
-apps:gnome-photos:3.14.0:
-apps:gnome-robots:3.14.1:
-apps:gnome-software:3.14.1:
-apps:gnome-sound-recorder:3.14.0.1:
-apps:gnome-sudoku:3.14.1:
+apps:gnome-photos:3.14.2:
+apps:gnome-robots:3.14.2:
+apps:gnome-software:3.14.2:
+apps:gnome-sound-recorder:3.14.2:
+apps:gnome-sudoku:3.14.2:
 apps:gnome-tetravex:3.14.0:
 apps:gnome-tweak-tool:3.14.0:
 apps:gnome-weather:3.14.1:
-apps:hitori:3.14.0.1:
-apps:iagno:3.14.1:
+apps:hitori:3.14.1:
+apps:iagno:3.14.2:
 apps:lightsoff:3.14.1:
 apps:nautilus-sendto:3.8.2:
 apps:nemiver:0.9.5:
-apps:orca:3.14.0:
+apps:orca:3.14.2:
 apps:polari:3.14.1:
 apps:quadrapassel:3.14.0:
-apps:rygel:0.24.1:
+apps:rygel:0.24.2:
 apps:seahorse:3.14.0:
 apps:swell-foop:3.14.0:
 apps:tali:3.14.0:
-apps:vinagre:3.14.1:
+apps:vinagre:3.14.2:

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile	2014-11-15 22:20:14 UTC (rev 128176)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile	2014-11-15 23:05:59 UTC (rev 128177)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            gnome3-core
-version         3.14.1
+version         3.14.2
 categories      gnome
 license         Permissive
 maintainers     devans openmaintainer

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt	2014-11-15 22:20:14 UTC (rev 128176)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt	2014-11-15 23:05:59 UTC (rev 128177)
@@ -1,7 +1,7 @@
 core:NetworkManager:0.9.10.0:
-core:adwaita-icon-theme:3.14.0:
+core:adwaita-icon-theme:3.14.1:
 core:at-spi2-atk:2.14.1:
-core:at-spi2-core:2.14.0:
+core:at-spi2-core:2.14.1:
 core:atk:2.14.0:
 core:atkmm:2.22.7:
 core:baobab:3.14.1:
@@ -13,45 +13,45 @@
 core:cogl:1.18.2:
 core:dconf:0.22.0:
 core:empathy:3.12.7:
-core:eog:3.14.1:
-core:epiphany:3.14.1:
+core:eog:3.14.2:
+core:epiphany:3.14.2:
 core:evince:3.14.1:
-core:evolution-data-server:3.12.7.1:
+core:evolution-data-server:3.12.8:
 core:folks:0.10.0:
 core:gcr:3.14.0:
 core:gdk-pixbuf:2.31.1:
 core:gdm:3.14.1:
 core:geocode-glib:3.14.0:
 core:gjs:1.42.0:
-core:glib:2.42.0:
+core:glib:2.42.1:
 core:glib-networking:2.42.0:
 core:glibmm:2.42.0:
 core:gmime:2.6.20:
 core:gnome-backgrounds:3.14.1:
 core:gnome-bluetooth:3.14.0:
-core:gnome-calculator:3.14.0:
-core:gnome-contacts:3.14.1:
-core:gnome-control-center:3.14.1:
-core:gnome-desktop:3.14.1:
-core:gnome-dictionary:3.14.1:
-core:gnome-disk-utility:3.12.1:
+core:gnome-calculator:3.14.1:
+core:gnome-contacts:3.14.2:
+core:gnome-control-center:3.14.2:
+core:gnome-desktop:3.14.2:
+core:gnome-dictionary:3.14.2:
+core:gnome-disk-utility:3.14.0:
 core:gnome-font-viewer:3.14.0:
 core:gnome-js-common:0.1.2:
 core:gnome-keyring:3.14.0:
 core:gnome-menus:3.13.3:
-core:gnome-online-accounts:3.14.0:
+core:gnome-online-accounts:3.14.2:
 core:gnome-online-miners:3.14.0:
-core:gnome-packagekit:3.14.0:
+core:gnome-packagekit:3.14.2:
 core:gnome-screenshot:3.14.0:
 core:gnome-session:3.14.0:
-core:gnome-settings-daemon:3.14.1:
-core:gnome-shell:3.14.1:
-core:gnome-shell-extensions:3.14.1:
+core:gnome-settings-daemon:3.14.2:
+core:gnome-shell:3.14.2:
+core:gnome-shell-extensions:3.14.2:
 core:gnome-system-log:3.9.90:
 core:gnome-system-monitor:3.14.1:
-core:gnome-terminal:3.14.1:
-core:gnome-themes-standard:3.14.0:
-core:gnome-user-docs:3.14.1:
+core:gnome-terminal:3.14.2:
+core:gnome-themes-standard:3.14.2:
+core:gnome-user-docs:3.14.2:
 core:gnome-user-share:3.14.0:
 core:gnome-video-effects:0.4.1:
 core:gobject-introspection:1.42.0:
@@ -59,20 +59,20 @@
 core:grilo-plugins:0.2.13:
 core:gsettings-desktop-schemas:3.14.1:
 core:gssdp:0.14.10:
-core:gtk+:3.14.3:
+core:gtk+:3.14.5:
 core:gtk+:2.24.25:
 core:gtk-doc:1.21:
 core:gtk-engines:2.20.2:
 core:gtkmm:3.14.0:
-core:gtksourceview:3.14.1:
-core:gucharmap:3.14.1:
+core:gtksourceview:3.14.2:
+core:gucharmap:3.14.2:
 core:gupnp:0.20.12:
 core:gupnp-igd:0.2.4:
-core:gvfs:1.22.1:
+core:gvfs:1.22.2:
 core:json-glib:1.0.2:
 core:libchamplain:0.12.9:
 core:libcroco:0.6.8:
-core:libgdata:0.16.0:
+core:libgdata:0.16.1:
 core:libgee:0.16.1:
 core:libgnomekbd:3.6.0:
 core:libgsf:1.14.30:
@@ -92,8 +92,8 @@
 core:libzapojit:0.0.3:
 core:mm-common:0.9.7:
 core:mousetweaks:3.12.0:
-core:mutter:3.14.1:
-core:nautilus:3.14.0:
+core:mutter:3.14.2:
+core:nautilus:3.14.1:
 core:network-manager-applet:0.9.10.0:
 core:pango:1.36.8:
 core:pangomm:2.34.0:
@@ -102,10 +102,10 @@
 core:sushi:3.12.0:
 core:totem:3.14.0:
 core:totem-pl-parser:3.10.3:
-core:tracker:1.2.2:
+core:tracker:1.2.4:
 core:vala:0.26.1:
-core:vino:3.14.0:
-core:vte:0.38.1:
+core:vino:3.14.1:
+core:vte:0.38.2:
 core:yelp:3.14.1:
 core:yelp-tools:3.14.1:
 core:yelp-xsl:3.14.0:


Property changes on: users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gstreamer1-gst-plugins-bad:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gstreamer1-gst-plugins-bad:125773-128154
/users/rmstonecipher/gnome/gstreamer1-gst-plugins-bad:102363-103172
   + /branches/mld-qt-481/dports/gnome/gstreamer1-gst-plugins-bad:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gstreamer1-gst-plugins-bad:125773-128176
/users/rmstonecipher/gnome/gstreamer1-gst-plugins-bad:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/Portfile	2014-11-15 22:20:14 UTC (rev 128176)
+++ users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/Portfile	2014-11-15 23:05:59 UTC (rev 128177)
@@ -63,7 +63,8 @@
 use_autoreconf      yes
 autoreconf.args     -fvi
 
-patchfiles          modplug.patch
+patchfiles          modplug.patch \
+                    patch-opengl-10.6.diff
 
 #
 # could depend on tons for multimedia stuff +variants
@@ -103,10 +104,12 @@
 
 #
 # applemedia video plugin uses CoreMedia which is not available on darwin 10 or earlier
+# gl cocoa build continues to fail due to use of API not available on darwin 10 or earlier
 #
 
 if { ${os.major} < 11 } {
-    configure.args-append   --disable-apple_media
+    configure.args-append   --disable-apple_media \
+                            --disable-cocoa
 }
 
 #

Copied: users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/files/patch-opengl-10.6.diff (from rev 128176, trunk/dports/gnome/gstreamer1-gst-plugins-bad/files/patch-opengl-10.6.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/files/patch-opengl-10.6.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/files/patch-opengl-10.6.diff	2014-11-15 23:05:59 UTC (rev 128177)
@@ -0,0 +1,24 @@
+--- gst-libs/gst/gl/gstglapi.h.orig	2014-11-15 12:17:15.000000000 -0800
++++ gst-libs/gst/gl/gstglapi.h	2014-11-15 12:20:21.000000000 -0800
+@@ -71,7 +71,8 @@
+ # ifdef __APPLE__
+ #  include <OpenGL/OpenGL.h>
+ #  include <OpenGL/gl.h>
+-#  if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
++#  include <Availability.h>
++#  if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+ #   define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
+ #   include <OpenGL/gl3.h>
+ #  endif
+--- configure.ac.orig	2014-11-06 02:22:38.000000000 -0800
++++ configure.ac	2014-11-15 12:27:45.000000000 -0800
+@@ -857,7 +857,8 @@
+ # if __APPLE__
+ #  include <OpenGL/OpenGL.h>
+ #  include <OpenGL/gl.h>
+-#  if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
++#  include <Availability.h>
++#  if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+ #   define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
+ #   include <OpenGL/gl3.h>
+ #  endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141115/9146621f/attachment-0001.html>


More information about the macports-changes mailing list