Merge remote-tracking branch 'origin/master' into abnt-gaps-java

.gitignore

@@ -79,25 +79,27 @@
 /src/Makefile.in
 /src/ginga
 /src/ginga-gl
-/tests-ncl/Makefile
-/tests-ncl/Makefile.in
-/tests-ncl/test-media-*-4grid.ncl
-/tests-ncl/test-media-*-anim-background.ncl
-/tests-ncl/test-media-*-anim-dimensions.ncl
-/tests-ncl/test-media-*-anim-transparency.ncl
-/tests-ncl/test-media-*-dimensions.ncl
-/tests-ncl/test-media-*-empty.ncl
-/tests-ncl/test-media-*-explicitDur.ncl
-/tests-ncl/test-media-*-focusIndex.ncl
-/tests-ncl/test-media-*-loop.ncl
-/tests-ncl/test-media-*-nested-region.ncl
-/tests-ncl/test-media-*-no-desc.ncl
-/tests-ncl/test-media-*-no-region.ncl
-/tests-ncl/test-media-*-stop-self.ncl
-/tests-ncl/test-media-*-transparency.ncl
-/tests-ncl/test-media-*-visible.ncl
-/tests-ncl/test-media-*-zIndex.ncl
-/tests-ncl/test-mime-*.ncl
+/tests-ncl/generated/Makefile
+/tests-ncl/generated/Makefile.in
+/tests-ncl/generated/test-media-*-4grid.ncl
+/tests-ncl/generated/test-media-*-anim-background.ncl
+/tests-ncl/generated/test-media-*-anim-dimensions.ncl
+/tests-ncl/generated/test-media-*-anim-transparency.ncl
+/tests-ncl/generated/test-media-*-dimensions.ncl
+/tests-ncl/generated/test-media-*-empty.ncl
+/tests-ncl/generated/test-media-*-explicitDur.ncl
+/tests-ncl/generated/test-media-*-focusIndex.ncl
+/tests-ncl/generated/test-media-*-loop.ncl
+/tests-ncl/generated/test-media-*-nested-region.ncl
+/tests-ncl/generated/test-media-*-no-desc.ncl
+/tests-ncl/generated/test-media-*-no-region.ncl
+/tests-ncl/generated/test-media-*-stop-self.ncl
+/tests-ncl/generated/test-media-*-transparency.ncl
+/tests-ncl/generated/test-media-*-visible.ncl
+/tests-ncl/generated/test-media-*-zIndex.ncl
+/tests-ncl/generated/test-media-*-actions.ncl
+/tests-ncl/generated/test-mime-*.ncl
+/tests-ncl/generated/test-transition-*.ncl
 /tests/Makefile
 /tests/Makefile.in
 /tests/env.csh
@@ -108,31 +110,32 @@
 /tests/test-Context-naturalend
 /tests/test-Context-nested-naturalend
 /tests/test-Context-ports
+/tests/test-Context-ports-started-from-ports
+/tests/test-Context-ports-started-from-links
 /tests/test-Document-evalPredicate
 /tests/test-Document-evalPredicate-from-link
 /tests/test-Document-evalPredicate-from-rule
 /tests/test-Document-addObject
 /tests/test-Document-getObjectById
 /tests/test-Document-getObjectByIdOrAlias
 /tests/test-Document-new
+/tests/test-Document-empty
 /tests/test-Event-getEventStateAsString
 /tests/test-Event-getEventTransitionAsString
 /tests/test-Event-getEventTypeAsString
 /tests/test-Event-isLambda
 /tests/test-Event-new
 /tests/test-Event-setInterval
 /tests/test-Event-setParameter
-/tests/test-Event-transition-Context-abort
-/tests/test-Event-transition-Context-pause
-/tests/test-Event-transition-Context-resume
-/tests/test-Event-transition-Context-start
-/tests/test-Event-transition-Context-stop
-/tests/test-Event-transition-Media-abort
-/tests/test-Event-transition-Media-pause
-/tests/test-Event-transition-Media-resume
-/tests/test-Event-transition-Media-start
-/tests/test-Event-transition-Media-stop
-/tests/test-Event-transition-Switch-start
+/tests/test-Context-transition-attribution
+/tests/test-Context-transition-presentation
+/tests/test-Context-transition-selection
+/tests/test-Media-transition-attribution
+/tests/test-Media-transition-presentation
+/tests/test-Media-transition-selection
+/tests/test-Switch-transition-attribution
+/tests/test-Switch-transition-presentation
+/tests/test-Switch-transition-selection
 /tests/test-Ginga-create
 /tests/test-Ginga-getOptionBool
 /tests/test-Ginga-getOptionInt
@@ -145,23 +148,35 @@
 /tests/test-Ginga-version
 /tests/test-GingaInternal-getData
 /tests/test-GingaInternal-setData
+/tests/test-Ginga-resize
+/tests/test-Ginga-redraw
 /tests/test-Media-new
+/tests/test-Media-getZ
+/tests/test-Media-refer
+/tests/test-Media-link-onSelection
 /tests/test-Media-4grid
 /tests/test-Media-mime
-/tests/test-Media-focusIndex
+/tests/test-Media-focusIndex-changed-by-link
+/tests/test-Media-focusIndex-changed-by-sendKey
 /tests/test-Media-explicitDur
 /tests/test-Media-nested-explicitDur
+/tests/test-Media-anchors-started-from-ports
+/tests/test-Media-anchors-started-from-links
 /tests/test-MediaSettings-instances
+/tests/test-MediaSettings-refer
 /tests/test-MediaSettings-new
+/tests/test-Siggen-new
+/tests/test-Object-getTime
+/tests/test-Object-sendKey
 /tests/test-Object-addAlias
 /tests/test-Object-addEvent
 /tests/test-Parser-parseBuffer
 /tests/test-Parser-parseFile
 /tests/test-ParserLua-parseBuffer
+/tests/test-ParserLua-parseFile
 /tests/test-Predicate-atom
 /tests/test-Predicate-new
 /tests/test-Switch-new
-/tests/test-SigGen-transmission
 /tests/test-aux-ginga-parse-bool
 /tests/test-aux-ginga-parse-color
 /tests/test-aux-ginga-parse-list
@@ -189,6 +204,7 @@
 /tests/test-aux-xstrtod
 /tests/test-aux-xstrtodorpercent
 /tests/test-aux-xstrtoll
+/tests/test-aux-xstrtoull
 /tests/test-aux-xstrup
 /tests/test-aux-xurifromsrc
 /tests/test-aux-xurigetcontents

Dockerfile

@@ -9,7 +9,6 @@ RUN apt-get update -y -qq
 RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
 RUN apt-add-repository -y ppa:george-edison55/cmake-3.x
 RUN add-apt-repository -y ppa:gnome3-team/gnome3
-RUN add-apt-repository -y ppa:gnome3-team/gnome3-staging
 RUN apt-get update -y -qq
 
 RUN apt-get install -y git gcc g++ autotools-dev dh-autoreconf \

Makefile.am

@@ -19,7 +19,7 @@
 include $(top_srcdir)/build-aux/Makefile.am.common
 
 ACLOCAL_AMFLAGS= -I build-aux ${ACLOCAL_FLAGS}
-SUBDIRS= lib src src-gui tests-ncl tests
+SUBDIRS= lib src src-gui tests-ncl/generated tests
 
 # Setup code coverage.
 include $(top_srcdir)/build-aux/Makefile.am.coverage

build-aux/Makefile.am.coverage

@@ -16,7 +16,7 @@
 
 LCOV_DIR= coverage
 LCOV_INFO= coverage.info
-COVERAGE_EXCLUDE=
+COVERAGE_EXCLUDE=tests/* /usr/include/c++/5/* /usr/include/c++/5/**/* /usr/include/gstreamer-1.0/gst/*
 
 lcov_capture_options= --capture --directory $(top_builddir)\
   --output-file $(LCOV_INFO) --test-name '$(PACKAGE_NAME)_PERF'\

build-cmake/CMakeLists.txt

@@ -17,6 +17,7 @@ set (PACKAGE "ginga")
 set (GINGA_BINARY_DIR ${CMAKE_BINARY_DIR}/bin)
 set (GINGA_BINARY_TESTS_DIR ${CMAKE_BINARY_DIR}/tests)
 add_definitions (-DGINGADATADIR="${CMAKE_INSTALL_FULL_DATADIR}/${PACKAGE}")
+add_definitions (-DGINGABINDIR="${CMAKE_INSTALL_FULL_BINDIR}")
 
 # Find dependencies
 find_package (GLIB 2.32 REQUIRED COMPONENTS gobject gio gthread gmodule)

configure.ac

@@ -131,6 +131,21 @@ AC_LANG_PUSH([C])
 AU_ARG_ENABLE_WARNINGS([$nw])
 AC_LANG_POP
 
+# Check for MacOS X
+platform_osx=no
+AC_MSG_CHECKING([if compiling for Mac OS X])
+case "$host_os" in
+  darwin*)
+     AC_MSG_RESULT(yes)
+     AC_DEFINE(PLATFORM_OSX, 1, [define to 1 if compiling for Mac OS X])
+     platform_osx=yes
+     ;;
+  *)
+     ;;
+esac
+AC_MSG_RESULT($platform_osx)
+AM_CONDITIONAL(PLATFORM_OSX, test "x$platform_osx" = xyes)
+
 # Required dependencies.
 AU_VERSION_BREAK([cairo], cairo_required_version)
 AU_CHECK_PKG([CAIRO], [cairo >= cairo_required_version],
@@ -270,8 +285,7 @@ AU_CHECK_OPTIONAL_PKG([nclua], [build with NCLua support], [],
 
 AU_CHECK_OPTIONAL_PKG([opengl], [build with OpenGL support], [],
  [OPENGL],
- [gl >= opengl_required_version
-  sdl2])
+ [gl >= opengl_required_version and sdl2])
 
 # Aliases for compiler flags.
 AS_VAR_APPEND([GINGA_ALL_CXXFLAGS], [" $WARN_CFLAGS $WERROR_CFLAGS "])
@@ -306,8 +320,10 @@ AC_SUBST([GINGA_ALL_LDFLAGS])
 # Directories.
 gingadatadir="$datadir/$PACKAGE"
 gingasysconfdir="$sysconfdir/$PACKAGE"
+gingabindir="$bindir"
 AC_SUBST([gingadatadir])
 AC_SUBST([gingasysconfdir])
+AC_SUBST([gingabindir])
 
 # Epilogue.
 AC_CONFIG_FILES([
@@ -318,7 +334,7 @@ src/Makefile
 src-gui/Makefile
 src-gui/icons/Makefile
 src-gui/style/Makefile
-tests-ncl/Makefile
+tests-ncl/generated/Makefile
 tests/Makefile
 ])
 

debian/copyright

@@ -1 +1 @@
-
+License: GPL-2+

debian/postinst

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+    xdg-mime install /usr/share/ginga/mime/application-x-ncl-NCL.xml
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

examples/.gitignore

@@ -60,4 +60,5 @@
 /velha-peta5
 /velhamd
 /vivamais-alim
-/vivamais-peso
+/vivamais-peso
+/nclua-tutorial

examples/fetch.sh

@@ -20,19 +20,28 @@ APPS="$APPS africa2010"
 APPS="$APPS comerciais-proview"
 APPS="$APPS formula1"
 APPS="$APPS hackerteen"
-APPS="$APPS matrix"
+APPS="$APPS hrace"
 APPS="$APPS orchestra"
 APPS="$APPS pixelation"
 APPS="$APPS proderj"
+APPS="$APPS roteiro-do-dia"
 APPS="$APPS velha"
 APPS="$APPS velha"
 APPS="$APPS vivamais-peso"
+APPS="$APPS vivamais-alim"
 
 URI=http://www.telemidia.puc-rio.br/~gflima/misc/nclapps
+URI_PATCHS=https://raw.githubusercontent.com/andrelbd1/ginga_aplications/master/
+PATCHS="comerciais-proview/main.ncl comerciais-proview/connbase.ncl comerciais-proview/app_cover.png comerciais-proview/app_thumbnail.png formula1/formula1.ncl formula1/app_cover.png formula1/app_thumbnail.png hackerteen/hackerteen.lua hackerteen/hackerteen.ncl hackerteen/app_cover.png hackerteen/app_thumbnail.png orchestra/orchestra.ncl orchestra/app_cover.png orchestra/app_thumbnail.png pixelation/pixelation.ncl pixelation/app_cover.png pixelation/app_thumbnail.png proderj/proderj.ncl proderj/app_cover.png proderj/app_thumbnail.png roteiro-do-dia/connectorBase.ncl roteiro-do-dia/descriptorBase.ncl roteiro-do-dia/main.ncl roteiro-do-dia/regionBase.ncl roteiro-do-dia/app_cover.png roteiro-do-dia/app_thumbnail.png velha/connbase.ncl velha/main.ncl velha/app_cover.png velha/app_thumbnail.png vivamais-alim/vivamais.ncl vivamais-alim/vivamais30.conn vivamais-alim/app_cover.png vivamais-alim/app_thumbnail.png vivamais-peso/peso.deps vivamais-peso/peso.lua vivamais-peso/app_cover.png vivamais-peso/app_thumbnail.png pacman/app_cover.png pacman/app_thumbnail.png hrace/app_cover.png hrace/app_thumbnail.png hrace/hrace.lua hrace/hrace.ncl"
+
 for app in $APPS; do
-  wget --show-progress -q -r -N -np -nH --cut-dirs 3\
-       -R "index.html*" "$URI/$app/"
+  wget --show-progress -q -r -N -np -nH --cut-dirs 3 \
+    -R "index.html*" "$URI/$app/"
 done
 
 git clone https://github.com/robertogerson/nclua-tutorial.git
 
+for patch in $PATCHS; do
+  rm $patch
+  wget $URI_PATCHS/$patch -P $(dirname $patch)/
+done

examples/primeiro-joao/11nclua.ncl

@@ -154,7 +154,7 @@
       <port id="pTechno" component="imgTechno"/>
       <port id="pCartoon" component="imgCartoon"/>
       <port id="pNCLua" component="changes"/>
-      <media id="changes" src="../script/counter.lua" descriptor="changesDesc">
+      <media id="changes" src="script/counter.lua" descriptor="changesDesc">
         <area id="print" label="fim"/>
         <property name="add"/>
       </media>

extra/lirc/startup.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+sudo service lirc start
+
+
+sudo killall irexec
+sudo irexec &
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR/../../
+./src-gui/gingagui -b

extra/macos/Info.plist

@@ -14,5 +14,29 @@
     <string>APPL</string>
     <key>CFBundleIconFile</key>
     <string>Icon.icns</string>
+    <key>UTExportedTypeDeclarations</key>
+    <array>
+        <dict>
+            <key>UTTypeIdentifier</key>
+            <string>com.telemidia.ginga.ncl</string>
+            <key>UTTypeTagSpecification</key>
+            <dict>
+            <key>public.filename-extension</key>
+              <array>
+                <string>ncl</string>
+              </array>
+            </dict>
+            <key>UTTypeConformsTo</key>
+            <array>
+             <string>public.data</string>
+            </array>
+            <key>UTTypeDescription</key>
+            <string>NCL file</string>
+            <key>UTTypeIconFile</key>
+            <string>Icon.icns</string>
+            <key>UTTypeReferenceURL</key>
+            <string>http://www.ncl.org.br/</string>
+        </dict>
+    </array>
 </dict>
 </plist>

extra/macos/README.md

@@ -1,6 +1,6 @@
 ## Building the repository on macOS
 
-Download [brew](<brew.sh>).
+Download [brew](<http://brew.sh>).
 
 To install the dependencies run on macOS terminal: