diff -Nru xjadeo-0.8.5/ChangeLog xjadeo-0.8.7/ChangeLog --- xjadeo-0.8.5/ChangeLog 2015-11-25 01:27:00.000000000 +0000 +++ xjadeo-0.8.7/ChangeLog 2016-11-28 12:37:31.000000000 +0000 @@ -1,3 +1,11 @@ +2016-11-28 (0.8.7) Robin Gareus +* fix release builds (mistake in 0.8.6) + +2016-11-28 (0.8.6) Robin Gareus +* explicitly request single-screen fullscreen on OSX +* weak-link against libjack (binaries) +* add NetBSD support + 2015-11-26 (0.8.5) Robin Gareus * release openGL context * add compatibility for ffmpeg-2.9 diff -Nru xjadeo-0.8.5/config.guess xjadeo-0.8.7/config.guess --- xjadeo-0.8.5/config.guess 2015-09-11 21:33:53.000000000 +0000 +++ xjadeo-0.8.7/config.guess 2016-04-30 10:57:03.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2016-04-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -237,6 +237,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -268,42 +272,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -376,16 +380,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -410,7 +414,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -635,13 +639,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -680,11 +684,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -697,12 +701,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -807,14 +811,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -896,7 +900,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -919,7 +923,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -965,6 +969,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1120,7 +1127,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1269,6 +1276,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1282,9 +1292,9 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in @@ -1306,7 +1316,7 @@ exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1337,7 +1347,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1379,7 +1389,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1390,6 +1400,9 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 < header file. */ @@ -77,7 +77,7 @@ /* Define as 1 if you have the loblo OSC library */ #define HAVE_LIBLO 1 -/* Video Output: XVideo support (linux) */ +/* Video Output: XVideo support (linux,netbsd) */ #define HAVE_LIBXV 1 /* Define as 1 if you have libltc - http://github.com/x42/libltc */ @@ -104,7 +104,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_PTHREAD_H 1 -/* Define as 1 if you have the SDL toolkit (win,osx,linux) */ +/* Define as 1 if you have the SDL toolkit (linux,netbsd,osx,win) */ #define HAVE_SDL 1 /* Define to 1 if you have the header file. */ @@ -184,6 +184,9 @@ /* GNU/Linux version */ #define PLATFORM_LINUX /**/ +/* NetBSD version */ +/* #undef PLATFORM_NETBSD */ + /* Mac OSX version */ /* #undef PLATFORM_OSX */ @@ -223,7 +226,7 @@ /* #undef TTFFONTFILE */ /* Version number of package */ -#define VERSION "0.8.5" +#define VERSION "0.8.7" /* enable xjadeo windows context-menu */ #define WINMENU 1 diff -Nru xjadeo-0.8.5/config.h.in xjadeo-0.8.7/config.h.in --- xjadeo-0.8.5/config.h.in 2015-11-25 14:17:11.000000000 +0000 +++ xjadeo-0.8.7/config.h.in 2016-11-28 12:38:48.000000000 +0000 @@ -3,10 +3,10 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD -/* Define as 1 to enable ALSA-raw midi (linux) */ +/* Define as 1 to enable ALSA-raw midi (linux,netbsd) */ #undef ALSA_RAW_MIDI -/* Define as 1 to enable ALSA sequencer (linux) */ +/* Define as 1 to enable ALSA sequencer (linux,netbsd) */ #undef ALSA_SEQ_MIDI /* errors in the resource config file only result in a warning message instead @@ -49,10 +49,10 @@ /* Use freetype for OSD */ #undef HAVE_FT -/* Define to enable openGL (win,osx,linux) */ +/* Define to enable openGL (linux,netbsd,osx,win) */ #undef HAVE_GL -/* Video Output: plain old imlib2 (linux) */ +/* Video Output: plain old imlib2 (linux,netbsd) */ #undef HAVE_IMLIB2 /* Define to 1 if you have the header file. */ @@ -76,7 +76,7 @@ /* Define as 1 if you have the loblo OSC library */ #undef HAVE_LIBLO -/* Video Output: XVideo support (linux) */ +/* Video Output: XVideo support (linux,netbsd) */ #undef HAVE_LIBXV /* Define as 1 if you have libltc - http://github.com/x42/libltc */ @@ -103,7 +103,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PTHREAD_H -/* Define as 1 if you have the SDL toolkit (win,osx,linux) */ +/* Define as 1 if you have the SDL toolkit (linux,netbsd,osx,win) */ #undef HAVE_SDL /* Define to 1 if you have the header file. */ @@ -183,6 +183,9 @@ /* GNU/Linux version */ #undef PLATFORM_LINUX +/* NetBSD version */ +#undef PLATFORM_NETBSD + /* Mac OSX version */ #undef PLATFORM_OSX diff -Nru xjadeo-0.8.5/config.sub xjadeo-0.8.7/config.sub --- xjadeo-0.8.5/config.sub 2015-09-11 21:33:53.000000000 +0000 +++ xjadeo-0.8.7/config.sub 2016-04-30 10:57:03.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2016-03-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -521,7 +520,7 @@ basic_machine=i386-pc os=-aros ;; - asmjs) + asmjs) basic_machine=asmjs-unknown ;; aux) @@ -1383,7 +1382,7 @@ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ @@ -1399,7 +1398,8 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1531,6 +1531,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) diff -Nru xjadeo-0.8.5/configure xjadeo-0.8.7/configure --- xjadeo-0.8.5/configure 2015-11-25 14:17:05.000000000 +0000 +++ xjadeo-0.8.7/configure 2016-11-28 12:38:40.000000000 +0000 @@ -688,6 +688,8 @@ WINDRES TARGET_WIN32_FALSE TARGET_WIN32_TRUE +TARGET_NETBSD_FALSE +TARGET_NETBSD_TRUE TARGET_LINUX_FALSE TARGET_LINUX_TRUE TARGET_OSX_FALSE @@ -795,6 +797,7 @@ enable_contrib enable_timescale enable_framecrop +enable_weakjack enable_dependency_tracking ' ac_precious_vars='build_alias @@ -1483,6 +1486,8 @@ --enable-timescale enable time-mapping/loop-playback support - experimental - DO NOT USE --enable-framecrop hardcoded frame cropping - experimental - DO NOT USE + --enable-weakjack load libjack at runtime (weak linking -- always + enabled on OSX and Windows) --enable-dependency-tracking do not reject slow dependency extractors --disable-dependency-tracking @@ -2735,7 +2740,7 @@ VERSION_MAJOR=0 VERSION_MINOR=8 -VERSION_SUB=5 +VERSION_SUB=7 am__api_version='1.15' @@ -3434,6 +3439,11 @@ enableval=$enable_framecrop; fi +# Check whether --enable-weakjack was given. +if test "${enable_weakjack+set}" = set; then : + enableval=$enable_weakjack; +fi + LIBPREF=lib @@ -3470,6 +3480,14 @@ fi if false; then + TARGET_NETBSD_TRUE= + TARGET_NETBSD_FALSE='#' +else + TARGET_NETBSD_TRUE='#' + TARGET_NETBSD_FALSE= +fi + + if false; then TARGET_WIN32_TRUE= TARGET_WIN32_FALSE='#' else @@ -3506,6 +3524,14 @@ fi if false; then + TARGET_NETBSD_TRUE= + TARGET_NETBSD_FALSE='#' +else + TARGET_NETBSD_TRUE='#' + TARGET_NETBSD_FALSE= +fi + + if false; then TARGET_WIN32_TRUE= TARGET_WIN32_FALSE='#' else @@ -3515,6 +3541,50 @@ LIBS="$LIBS -L/usr/X11R6/lib" ;; + *netbsd*) + +$as_echo "#define PLATFORM_NETBSD /**/" >>confdefs.h + + PLATFORM_NETBSD=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: TARGET: NETBSD" >&5 +$as_echo "$as_me: TARGET: NETBSD" >&6;} + PM_OS="netbsd"; + +$as_echo "#define IMLIB2RGBA /**/" >>confdefs.h + + if false; then + TARGET_OSX_TRUE= + TARGET_OSX_FALSE='#' +else + TARGET_OSX_TRUE='#' + TARGET_OSX_FALSE= +fi + + if false; then + TARGET_LINUX_TRUE= + TARGET_LINUX_FALSE='#' +else + TARGET_LINUX_TRUE='#' + TARGET_LINUX_FALSE= +fi + + if true; then + TARGET_NETBSD_TRUE= + TARGET_NETBSD_FALSE='#' +else + TARGET_NETBSD_TRUE='#' + TARGET_NETBSD_FALSE= +fi + + if false; then + TARGET_WIN32_TRUE= + TARGET_WIN32_FALSE='#' +else + TARGET_WIN32_TRUE='#' + TARGET_WIN32_FALSE= +fi + + ;; *mingw32*|*win*) { $as_echo "$as_me:${as_lineno-$LINENO}: TARGET: WINDOWS" >&5 $as_echo "$as_me: TARGET: WINDOWS" >&6;} @@ -3545,6 +3615,14 @@ TARGET_LINUX_FALSE= fi + if false; then + TARGET_NETBSD_TRUE= + TARGET_NETBSD_FALSE='#' +else + TARGET_NETBSD_TRUE='#' + TARGET_NETBSD_FALSE= +fi + if true; then TARGET_WIN32_TRUE= TARGET_WIN32_FALSE='#' @@ -3655,7 +3733,7 @@ ;; esac -if test "x$enable_embed_font" == "xyes"; then +if test "x$enable_embed_font" = "xyes"; then if true; then EMBED_FONT_TRUE= EMBED_FONT_FALSE='#' @@ -6111,7 +6189,7 @@ fi -if test "x$enable_framecrop" == "xyes"; then +if test "x$enable_framecrop" = "xyes"; then $as_echo "#define CROPIMG 1" >>confdefs.h fi @@ -7489,6 +7567,14 @@ + +if test "x$enable_weakjack" = "xyes"; then + JACK_CFLAGS+=" -DUSE_WEAK_JACK" + JACK_LIBS=-ldl + + +fi + FREETYPE_LIBS= FREETYPE_CFLAGS= @@ -7990,6 +8076,26 @@ as_fn_error $? "conditional \"TARGET_LINUX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${TARGET_NETBSD_TRUE}" && test -z "${TARGET_NETBSD_FALSE}"; then + as_fn_error $? "conditional \"TARGET_NETBSD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${TARGET_WIN32_TRUE}" && test -z "${TARGET_WIN32_FALSE}"; then + as_fn_error $? "conditional \"TARGET_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${TARGET_OSX_TRUE}" && test -z "${TARGET_OSX_FALSE}"; then + as_fn_error $? "conditional \"TARGET_OSX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${TARGET_LINUX_TRUE}" && test -z "${TARGET_LINUX_FALSE}"; then + as_fn_error $? "conditional \"TARGET_LINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${TARGET_NETBSD_TRUE}" && test -z "${TARGET_NETBSD_FALSE}"; then + as_fn_error $? "conditional \"TARGET_NETBSD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${TARGET_WIN32_TRUE}" && test -z "${TARGET_WIN32_FALSE}"; then as_fn_error $? "conditional \"TARGET_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -8002,6 +8108,10 @@ as_fn_error $? "conditional \"TARGET_LINUX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${TARGET_NETBSD_TRUE}" && test -z "${TARGET_NETBSD_FALSE}"; then + as_fn_error $? "conditional \"TARGET_NETBSD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${TARGET_WIN32_TRUE}" && test -z "${TARGET_WIN32_FALSE}"; then as_fn_error $? "conditional \"TARGET_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -8014,6 +8124,10 @@ as_fn_error $? "conditional \"TARGET_LINUX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${TARGET_NETBSD_TRUE}" && test -z "${TARGET_NETBSD_FALSE}"; then + as_fn_error $? "conditional \"TARGET_NETBSD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${TARGET_WIN32_TRUE}" && test -z "${TARGET_WIN32_FALSE}"; then as_fn_error $? "conditional \"TARGET_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -9393,7 +9507,7 @@ else OSDREPORT="${OSDREPORT}-" fi - if test "x$enable_embed_font" == "xyes"; then + if test "x$enable_embed_font" = "xyes"; then OSDREPORT="${OSDREPORT} - embed font: yes" else @@ -9501,7 +9615,7 @@ " >&6;} fi -if test -n "$PLATFORM_LINUX" -a -n "$HAVE_PORTMIDI"; then +if test -n "$PLATFORM_LINUX$PLATFORM_NETBSD" -a -n "$HAVE_PORTMIDI"; then { $as_echo "$as_me:${as_lineno-$LINENO}: PortMidi is intended for non Un*x Platforms only. On Linux, please use JACK, ALSA-seq or ALSA-raw. @@ -9512,7 +9626,7 @@ " >&6;} fi -if test -n "$PLATFORM_LINUX$PLATFORM_OSX" -a -n "$HAVE_QT4"; then +if test -n "$PLATFORM_LINUX$PLATFORM_OSX$PLATFORM_NETBSD" -a -n "$HAVE_QT4"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: qjadeo is deprecated an not intended to be used. It will be removed in future releases. diff -Nru xjadeo-0.8.5/configure.ac xjadeo-0.8.7/configure.ac --- xjadeo-0.8.5/configure.ac 2015-11-25 01:29:32.000000000 +0000 +++ xjadeo-0.8.7/configure.ac 2016-11-28 12:36:59.000000000 +0000 @@ -8,7 +8,7 @@ VERSION_MAJOR=0 VERSION_MINOR=8 -VERSION_SUB=5 +VERSION_SUB=7 AM_INIT_AUTOMAKE(xjadeo, [${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUB}]) AM_CONFIG_HEADER(config.h) @@ -34,6 +34,7 @@ AC_ARG_ENABLE(contrib, AC_HELP_STRING([--enable-contrib], [Compile and install code in contrib folder (default:off)])) AC_ARG_ENABLE(timescale, AC_HELP_STRING([--enable-timescale], [enable time-mapping/loop-playback support - experimental - DO NOT USE])) AC_ARG_ENABLE(framecrop, AC_HELP_STRING([--enable-framecrop], [hardcoded frame cropping - experimental - DO NOT USE])) +AC_ARG_ENABLE(weakjack, AC_HELP_STRING([--enable-weakjack], [load libjack at runtime (weak linking -- always enabled on OSX and Windows)])) LIBPREF=lib @@ -51,6 +52,7 @@ HAVE_GL=1 AM_CONDITIONAL([TARGET_OSX], true) AM_CONDITIONAL([TARGET_LINUX], false) + AM_CONDITIONAL([TARGET_NETBSD], false) AM_CONDITIONAL([TARGET_WIN32], false) dnl 2006/11/13 : 32 bit RGBA is known not to work on OSX ffmpeg+imlib2 dnl IMLIB2RGBA @@ -63,9 +65,21 @@ AC_DEFINE([IMLIB2RGBA], [], [use native RGB32 ffmpeg -> imlib.]) AM_CONDITIONAL([TARGET_OSX], false) AM_CONDITIONAL([TARGET_LINUX], true) + AM_CONDITIONAL([TARGET_NETBSD], false) AM_CONDITIONAL([TARGET_WIN32], false) LIBS="$LIBS -L/usr/X11R6/lib" ;; + *netbsd*) + AC_DEFINE([PLATFORM_NETBSD], [], [NetBSD version]) + PLATFORM_NETBSD=1 + AC_MSG_NOTICE([TARGET: NETBSD]) + PM_OS="netbsd"; + AC_DEFINE([IMLIB2RGBA], [], [use native RGB32 ffmpeg -> imlib.]) + AM_CONDITIONAL([TARGET_OSX], false) + AM_CONDITIONAL([TARGET_LINUX], false) + AM_CONDITIONAL([TARGET_NETBSD], true) + AM_CONDITIONAL([TARGET_WIN32], false) + ;; *mingw32*|*win*) AC_MSG_NOTICE([TARGET: WINDOWS]) PM_OS=win @@ -78,6 +92,7 @@ HAVE_GL=1 AM_CONDITIONAL([TARGET_OSX], false) AM_CONDITIONAL([TARGET_LINUX], false) + AM_CONDITIONAL([TARGET_NETBSD], false) AM_CONDITIONAL([TARGET_WIN32], true) AC_CHECK_TOOL(WINDRES, windres, false) if test "$WINDRES" = "false"; then @@ -89,7 +104,7 @@ ;; esac -if test "x$enable_embed_font" == "xyes"; then +if test "x$enable_embed_font" = "xyes"; then AM_CONDITIONAL([EMBED_FONT], true) else AM_CONDITIONAL([EMBED_FONT], false) @@ -119,18 +134,18 @@ dnl Checks for libraries. dnl video output -AH_TEMPLATE([HAVE_GL], [Define to enable openGL (win,osx,linux)]) -AH_TEMPLATE([HAVE_SDL], [Define as 1 if you have the SDL toolkit (win,osx,linux)]) -AH_TEMPLATE([HAVE_LIBXV], [Video Output: XVideo support (linux)]) -AH_TEMPLATE([HAVE_IMLIB2], [Video Output: plain old imlib2 (linux)]) +AH_TEMPLATE([HAVE_GL], [Define to enable openGL (linux,netbsd,osx,win)]) +AH_TEMPLATE([HAVE_SDL], [Define as 1 if you have the SDL toolkit (linux,netbsd,osx,win)]) +AH_TEMPLATE([HAVE_LIBXV], [Video Output: XVideo support (linux,netbsd)]) +AH_TEMPLATE([HAVE_IMLIB2], [Video Output: plain old imlib2 (linux,netbsd)]) AH_TEMPLATE([IMLIB2RGBA], [Define for RGBA32 imlib2 (not RGB24)]) dnl MTC sync AH_TEMPLATE([HAVE_MIDI], [general MIDI (MTC) support]) AH_TEMPLATE([HAVE_JACKMIDI], [Define as 1 to enable JACK-MIDI]) AH_TEMPLATE([HAVE_PORTMIDI], [Define as 1 to enable the portmidi driver (win,osx)]) -AH_TEMPLATE([ALSA_SEQ_MIDI], [Define as 1 to enable ALSA sequencer (linux)]) -AH_TEMPLATE([ALSA_RAW_MIDI], [Define as 1 to enable ALSA-raw midi (linux)]) +AH_TEMPLATE([ALSA_SEQ_MIDI], [Define as 1 to enable ALSA sequencer (linux,netbsd)]) +AH_TEMPLATE([ALSA_RAW_MIDI], [Define as 1 to enable ALSA-raw midi (linux,netbsd)]) dnl LTC sync AH_TEMPLATE([HAVE_LTC], [Define as 1 if you have libltc - http://github.com/x42/libltc ]) @@ -170,7 +185,7 @@ AC_DEFINE(TIMEMAP) fi -if test "x$enable_framecrop" == "xyes"; then +if test "x$enable_framecrop" = "xyes"; then AC_DEFINE(CROPIMG) fi @@ -327,6 +342,16 @@ AC_SUBST(MIDI_LIBS) AC_SUBST(MIDI_CFLAGS) + +dnl --------------------------------------------------------------------------- +dnl weak-jack +if test "x$enable_weakjack" = "xyes"; then + JACK_CFLAGS+=" -DUSE_WEAK_JACK" + JACK_LIBS=-ldl + AC_SUBST(JACK_CFLAGS) + AC_SUBST(JACK_LIBS) +fi + dnl --------------------------------------------------------------------------- dnl Check for freetype (On Screen Display) FREETYPE_LIBS= @@ -462,7 +487,7 @@ else OSDREPORT="${OSDREPORT}-" fi - if test "x$enable_embed_font" == "xyes"; then + if test "x$enable_embed_font" = "xyes"; then OSDREPORT="${OSDREPORT} - embed font: yes" else @@ -531,14 +556,14 @@ ]) fi -if test -n "$PLATFORM_LINUX" -a -n "$HAVE_PORTMIDI"; then +if test -n "$PLATFORM_LINUX$PLATFORM_NETBSD" -a -n "$HAVE_PORTMIDI"; then AC_MSG_NOTICE([ PortMidi is intended for non Un*x Platforms only. On Linux, please use JACK, ALSA-seq or ALSA-raw. ]) fi -if test -n "$PLATFORM_LINUX$PLATFORM_OSX" -a -n "$HAVE_QT4"; then +if test -n "$PLATFORM_LINUX$PLATFORM_OSX$PLATFORM_NETBSD" -a -n "$HAVE_QT4"; then AC_MSG_WARN([ qjadeo is deprecated an not intended to be used. It will be removed in future releases. diff -Nru xjadeo-0.8.5/debian/changelog xjadeo-0.8.7/debian/changelog --- xjadeo-0.8.5/debian/changelog 2016-05-01 23:15:41.000000000 +0000 +++ xjadeo-0.8.7/debian/changelog 2016-11-29 13:35:46.000000000 +0000 @@ -1,8 +1,20 @@ -xjadeo (0.8.5-1build1) yakkety; urgency=medium +xjadeo (0.8.7-2) unstable; urgency=medium - * Rebuild for ffmpeg 3.0. + * Use upstream hi-resolution icon. - -- Colin Watson Mon, 02 May 2016 00:15:41 +0100 + -- Jaromír Mikeš Tue, 29 Nov 2016 14:35:46 +0100 + +xjadeo (0.8.7-1) unstable; urgency=medium + + * New upstream version 0.8.7 + * Set dh/compat 10. + * Fix VCS fields. + * Bump Standards. + * Update copyright file. + * Fix hardening. + * Add local-option file. + + -- Jaromír Mikeš Tue, 29 Nov 2016 09:38:04 +0100 xjadeo (0.8.5-1) unstable; urgency=medium diff -Nru xjadeo-0.8.5/debian/compat xjadeo-0.8.7/debian/compat --- xjadeo-0.8.5/debian/compat 2014-10-01 06:25:29.000000000 +0000 +++ xjadeo-0.8.7/debian/compat 2016-11-29 12:52:18.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru xjadeo-0.8.5/debian/control xjadeo-0.8.7/debian/control --- xjadeo-0.8.5/debian/control 2015-10-25 04:01:00.000000000 +0000 +++ xjadeo-0.8.7/debian/control 2016-11-29 12:52:18.000000000 +0000 @@ -6,8 +6,7 @@ Alessio Treglia , Jaromír Mikeš Build-Depends: - debhelper (>= 9), - dh-autoreconf, + debhelper (>= 10~), libasound2-dev [linux-any], libavcodec-dev (>= 7:2.7.1), libavformat-dev (>= 7:2.7.1), @@ -23,9 +22,9 @@ libxv-dev, libltc-dev, libsdl1.2-dev -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/xjadeo.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xjadeo.git +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/xjadeo.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/xjadeo.git Homepage: http://xjadeo.sourceforge.net/ Package: xjadeo diff -Nru xjadeo-0.8.5/debian/copyright xjadeo-0.8.7/debian/copyright --- xjadeo-0.8.5/debian/copyright 2014-10-01 06:25:29.000000000 +0000 +++ xjadeo-0.8.7/debian/copyright 2016-11-29 12:52:18.000000000 +0000 @@ -17,7 +17,7 @@ Files: debian/* Copyright: 2011-2012 Alessio Treglia - 2010-2013 Jaromír Mikeš + 2010-2016 Jaromír Mikeš License: GPL-2+ License: GPL-2+ diff -Nru xjadeo-0.8.5/debian/rules xjadeo-0.8.7/debian/rules --- xjadeo-0.8.5/debian/rules 2015-10-25 04:01:00.000000000 +0000 +++ xjadeo-0.8.7/debian/rules 2016-11-29 12:52:18.000000000 +0000 @@ -1,13 +1,12 @@ #!/usr/bin/make -f # -*- makefile -*- +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + LDFLAGS+=-Wl,--as-needed %: - dh $@ --parallel --with autoreconf - -override_dh_autoreconf: - dh_autoreconf --as-needed + dh $@ override_dh_auto_configure: dh_auto_configure -- \ diff -Nru xjadeo-0.8.5/debian/xjadeo.install xjadeo-0.8.7/debian/xjadeo.install --- xjadeo-0.8.5/debian/xjadeo.install 2015-10-25 04:01:00.000000000 +0000 +++ xjadeo-0.8.7/debian/xjadeo.install 2016-11-29 13:30:43.000000000 +0000 @@ -1,2 +1,2 @@ -debian/xjadeo.xpm /usr/share/pixmaps +src/qt-gui/images/qjadeo.png /usr/share/icons/hicolor/128x128/apps debian/xjadeo.desktop /usr/share/applications diff -Nru xjadeo-0.8.5/debian/xjadeo.xpm xjadeo-0.8.7/debian/xjadeo.xpm --- xjadeo-0.8.5/debian/xjadeo.xpm 2015-10-25 04:01:00.000000000 +0000 +++ xjadeo-0.8.7/debian/xjadeo.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,199 +0,0 @@ -/* XPM */ -static char *qjadeo_32x32[] = { -/* columns rows colors chars-per-pixel */ -"32 32 161 2 ", -" c #000000", -". c #010101", -"X c #020202", -"o c #030303", -"O c #040404", -"+ c #050505", -"@ c #060606", -"# c #070707", -"$ c #080808", -"% c #090909", -"& c #0A0A0A", -"* c #0B0B0B", -"= c #0C0C0C", -"- c #0D0D0D", -"; c #0E0E0E", -": c #0F0F0F", -"> c #101010", -", c #111111", -"< c #121212", -"1 c #131313", -"2 c #141414", -"3 c #151515", -"4 c #161616", -"5 c #171717", -"6 c #181818", -"7 c #191919", -"8 c #1A1A1A", -"9 c #1B1B1B", -"0 c #1C1C1C", -"q c #1D1D1D", -"w c #1E1E1E", -"e c #1F1F1E", -"r c #1F1F1F", -"t c #202020", -"y c #212121", -"u c #222222", -"i c #232323", -"p c #242424", -"a c #252525", -"s c #262626", -"d c #272727", -"f c #282827", -"g c #282828", -"h c #292929", -"j c #2A2A2A", -"k c #2D2D2D", -"l c #2E2E2E", -"z c #2F2F2F", -"x c #303030", -"c c #313131", -"v c #323232", -"b c #333333", -"n c #353535", -"m c #363636", -"M c #373737", -"N c #3A3A3A", -"B c #3A3B3B", -"V c #3B3B3B", -"C c #3C3C3C", -"Z c #3E3E3E", -"A c #3F3F3F", -"S c #404040", -"D c #424242", -"F c #434343", -"G c #444444", -"H c #454545", -"J c #464646", -"K c #474747", -"L c #494949", -"P c #4A4A4A", -"I c #4B4B4B", -"U c #4C4C4C", -"Y c #4D4D4C", -"T c #4D4D4D", -"R c #4E4E4E", -"E c #4F4F4F", -"W c #515151", -"Q c #525252", -"! c #535353", -"~ c #545454", -"^ c #565656", -"/ c #575757", -"( c #585858", -") c #595959", -"_ c #5A5A5A", -"` c #5B5B5B", -"' c #5C5C5C", -"] c #5D5D5D", -"[ c #5E5E5E", -"{ c #5F5F5F", -"} c #606060", -"| c #616161", -" . c #626262", -".. c #646464", -"X. c #656565", -"o. c #666666", -"O. c #676766", -"+. c #676767", -"@. c #686868", -"#. c #696969", -"$. c #6A6A6A", -"%. c #6B6B6B", -"&. c #6C6C6C", -"*. c #6D6D6D", -"=. c #6E6E6E", -"-. c #6F6F6F", -";. c #707070", -":. c #717171", -">. c #727272", -",. c #737373", -"<. c #747474", -"1. c #757575", -"2. c #767676", -"3. c #777777", -"4. c #787878", -"5. c #797979", -"6. c #7A7A7A", -"7. c #7B7B7B", -"8. c #7C7C7C", -"9. c #7D7D7D", -"0. c #7E7E7E", -"q. c #7F7F7F", -"w. c #818181", -"e. c #828282", -"r. c #828283", -"t. c #828383", -"y. c #838383", -"u. c #848484", -"i. c #858585", -"p. c #878787", -"a. c #8C8C8C", -"s. c #8D8D8D", -"d. c #8E8E8E", -"f. c #8F8F8F", -"g. c #909090", -"h. c #929292", -"j. c #939393", -"k. c #969696", -"l. c #989898", -"z. c #999999", -"x. c #9B9B9B", -"c. c #9C9C9C", -"v. c #9D9D9D", -"b. c #9E9E9E", -"n. c #9F9F9F", -"m. c #A0A0A0", -"M. c #A1A1A1", -"N. c #A2A2A2", -"B. c #A3A3A3", -"V. c #A4A4A4", -"C. c #A5A5A5", -"Z. c #A6A6A6", -"A. c #A8A8A8", -"S. c #A9A9A9", -"D. c #ACACAC", -"F. c #ADADAD", -"G. c #AFAFAF", -"H. c #B8B8B8", -"J. c #BFBFBF", -"K. c #CDCDCD", -"L. c None", -/* pixels */ -"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", -"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", -"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", -"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", -" ", -"g w u O 7 u & 7 u & 3 u & 3 u & 3 s & s ", -"..1.k.7 ..l.7 | l.w { l.w { l.u ) b.u = ..", -"7 = , O = , O = , & O , 3 & O = 3 O & 3 O O 7 ", -" O 3 7 w g M P / 1.s.1.u.a.t.9.6.:.=.:.t.t.t.=.t.| 6.+.& ", -" , 7 7 7 w s g g g B Y :.t...:...| :.=...#...6.:.p.=.=.Y | P O ", -" 3 u w w u g g s s B ! 1.:.) #.....1.#.1.:.6.6...6.=.=.| =.) O ", -" ", -" , & O w O M ", -" ..#. = 6.u w b.w & H ", -" z G.w +.s.O & O 3 O H Z.s o 2 O 3 & & H ", -" #.l.Z.u O s / #...! , 6.S.J., s 3.t.{ =.Z.:.& H ", -" u K./ D g. 9.H.=.=.=.m.P b.G.#...m.Y :.& B ", -" v g.6.G.g B / G.D 6.=.m.1.s.w ) g.g 3 #.{ :.v 3 ", -" 3 p.! { p.1., B | =.s C :.w g H M z / v O w ", -" O w B / { 3 ", -" o u 7 ", -" ", -"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", -" & s # g O z D 7 7 3 g | I O = D = ", -"7 , H = & 7 ! C & P ) , C z & & * H P { w & , = Y u = & O 7 ", -"Z.& = | / | ! t.#.O H 6.) | #.{ ! P & D C ` ) ! 6.#.:.! Y | u m.", -"g , C =.Y 1.H Y P O Y :.=.Y t.#./ Y , F C | | { ! ` 1./ Y =.= g ", -" = / z / D / z s O 7 v M ) D D M C u u z A H s v M v I v O ", -"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", -"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", -"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", -"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L." -}; diff -Nru xjadeo-0.8.5/doc/xjadeo.1 xjadeo-0.8.7/doc/xjadeo.1 --- xjadeo-0.8.5/doc/xjadeo.1 2015-11-25 14:17:18.000000000 +0000 +++ xjadeo-0.8.7/doc/xjadeo.1 2016-11-28 12:38:50.000000000 +0000 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH XJADEO "1" "November 2015" "xjadeo version 0.8.5" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH XJADEO "1" "November 2016" "xjadeo version 0.8.7" "User Commands" .SH NAME xjadeo \- X Jack Video Monitor .SH SYNOPSIS @@ -356,9 +356,9 @@ Website: .TP built from: -scm\-v0.8.5 +scm\-v0.8.7 .IP -compiled with: AVFORMAT=0x382865 AVCODEC=0x383c64 AVUTIL:0x361f64 +compiled with: AVFORMAT=0x392964 AVCODEC=0x393065 AVUTIL:0x371c64 configuration: [ LTC JACK\-SESSION POSIX\-MQueue OSC ] .br MTC/MIDI: [ jack\-midi alsa\-sequencer portmidi alsa\-raw ] diff -Nru xjadeo-0.8.5/doc/xjremote.1 xjadeo-0.8.7/doc/xjremote.1 --- xjadeo-0.8.5/doc/xjremote.1 2015-11-25 14:17:18.000000000 +0000 +++ xjadeo-0.8.7/doc/xjremote.1 2016-11-28 12:38:50.000000000 +0000 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH XJREMOTE "1" "November 2015" "xjremote version 0.8.5" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH XJREMOTE "1" "November 2016" "xjremote version 0.8.7" "User Commands" .SH NAME xjremote \- X Jack Video Monitor Remote Control .SH SYNOPSIS @@ -54,7 +54,7 @@ Website: .TP built from: -scm\-v0.8.5 +scm\-v0.8.7 .TP configuration: [ POSIX\-MQueue ] diff -Nru xjadeo-0.8.5/src/xjadeo/display_gl_osx.m xjadeo-0.8.7/src/xjadeo/display_gl_osx.m --- xjadeo-0.8.5/src/xjadeo/display_gl_osx.m 2015-11-10 20:54:37.000000000 +0000 +++ xjadeo-0.8.7/src/xjadeo/display_gl_osx.m 2016-04-20 15:11:41.000000000 +0000 @@ -320,7 +320,8 @@ } else if (![self isInFullScreenMode] && onoff) { - [self enterFullScreenMode:[NSScreen mainScreen] withOptions:nil]; + NSDictionary *opts = [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:NO], NSFullScreenModeAllScreens, nil]; + [self enterFullScreenMode:[NSScreen mainScreen] withOptions:opts]; } } diff -Nru xjadeo-0.8.5/src/xjadeo/Makefile.am xjadeo-0.8.7/src/xjadeo/Makefile.am --- xjadeo-0.8.5/src/xjadeo/Makefile.am 2015-11-10 20:54:37.000000000 +0000 +++ xjadeo-0.8.7/src/xjadeo/Makefile.am 2016-07-05 14:56:49.000000000 +0000 @@ -30,6 +30,10 @@ xjadeo_SOURCES+=display_glx.c xjadeo_LDADD+=@JACK_LIBS@ endif +if TARGET_NETBSD +xjadeo_SOURCES+=display_glx.c +xjadeo_LDADD+=@JACK_LIBS@ +endif if TARGET_WIN32 xjadeo_SOURCES+=display_gl_win.c windows.rc xjadeo_CFLAGS+=-DUSE_WEAK_JACK diff -Nru xjadeo-0.8.5/src/xjadeo/Makefile.in xjadeo-0.8.7/src/xjadeo/Makefile.in --- xjadeo-0.8.5/src/xjadeo/Makefile.in 2015-11-25 14:17:09.000000000 +0000 +++ xjadeo-0.8.7/src/xjadeo/Makefile.in 2016-11-28 12:38:45.000000000 +0000 @@ -93,15 +93,17 @@ bin_PROGRAMS = xjadeo$(EXEEXT) xjremote$(EXEEXT) @TARGET_LINUX_TRUE@am__append_1 = display_glx.c @TARGET_LINUX_TRUE@am__append_2 = @JACK_LIBS@ -@TARGET_WIN32_TRUE@am__append_3 = display_gl_win.c windows.rc -@TARGET_WIN32_TRUE@am__append_4 = -DUSE_WEAK_JACK -@TARGET_WIN32_TRUE@am__append_5 = -lws2_32 -lwinmm -lcomdlg32 -lpthread -@TARGET_OSX_TRUE@am__append_6 = display_gl_osx.m -@TARGET_OSX_TRUE@am__append_7 = -DUSE_WEAK_JACK -@TARGET_OSX_TRUE@am__append_8 = -ldl -@EMBED_FONT_TRUE@am__append_9 = osdfont.o -@EMBED_FONT_TRUE@am__append_10 = -DWITH_EMBEDDED_FONT +@TARGET_NETBSD_TRUE@am__append_3 = display_glx.c +@TARGET_NETBSD_TRUE@am__append_4 = @JACK_LIBS@ +@TARGET_WIN32_TRUE@am__append_5 = display_gl_win.c windows.rc +@TARGET_WIN32_TRUE@am__append_6 = -DUSE_WEAK_JACK +@TARGET_WIN32_TRUE@am__append_7 = -lws2_32 -lwinmm -lcomdlg32 -lpthread +@TARGET_OSX_TRUE@am__append_8 = display_gl_osx.m +@TARGET_OSX_TRUE@am__append_9 = -DUSE_WEAK_JACK +@TARGET_OSX_TRUE@am__append_10 = -ldl @EMBED_FONT_TRUE@am__append_11 = osdfont.o +@EMBED_FONT_TRUE@am__append_12 = -DWITH_EMBEDDED_FONT +@EMBED_FONT_TRUE@am__append_13 = osdfont.o subdir = src/xjadeo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -123,9 +125,10 @@ weak_libjack.h gtime.c gtime.h display_glx.c display_gl_win.c \ windows.rc display_gl_osx.m @TARGET_LINUX_TRUE@am__objects_1 = xjadeo-display_glx.$(OBJEXT) -@TARGET_WIN32_TRUE@am__objects_2 = xjadeo-display_gl_win.$(OBJEXT) \ +@TARGET_NETBSD_TRUE@am__objects_2 = xjadeo-display_glx.$(OBJEXT) +@TARGET_WIN32_TRUE@am__objects_3 = xjadeo-display_gl_win.$(OBJEXT) \ @TARGET_WIN32_TRUE@ windows.$(OBJEXT) -@TARGET_OSX_TRUE@am__objects_3 = xjadeo-display_gl_osx.$(OBJEXT) +@TARGET_OSX_TRUE@am__objects_4 = xjadeo-display_gl_osx.$(OBJEXT) am_xjadeo_OBJECTS = xjadeo-main.$(OBJEXT) xjadeo-xjadeo.$(OBJEXT) \ xjadeo-remote.$(OBJEXT) xjadeo-mqueue.$(OBJEXT) \ xjadeo-xjosc.$(OBJEXT) xjadeo-configfile.$(OBJEXT) \ @@ -138,7 +141,7 @@ xjadeo-display_mac.$(OBJEXT) xjadeo-display_x11.$(OBJEXT) \ xjadeo-display_sdl.$(OBJEXT) xjadeo-weak_libjack.$(OBJEXT) \ xjadeo-gtime.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ - $(am__objects_3) + $(am__objects_3) $(am__objects_4) xjadeo_OBJECTS = $(am_xjadeo_OBJECTS) am__DEPENDENCIES_1 = xjadeo_LINK = $(OBJCLD) $(xjadeo_OBJCFLAGS) $(OBJCFLAGS) \ @@ -398,16 +401,17 @@ display_x_dialog.c libsofd.c display_mac.c display_x11.c \ display_sdl.c display_gl_common.h weak_libjack.c \ weak_libjack.h gtime.c gtime.h $(am__append_1) $(am__append_3) \ - $(am__append_6) + $(am__append_5) $(am__append_8) xjadeo_LDADD = @MQ_LIBS@ @FFMPEG_LIBS@ @XV_LIBS@ @MIDI_LIBS@ \ @FREETYPE_LIBS@ @IMLIB2_LIBS@ @XPM_LIBS@ @LIBLO_LIBS@ \ @SDL_LIBS@ @LTC_LIBS@ @GL_LIBS@ -lm $(am__append_2) \ - $(am__append_5) $(am__append_8) $(am__append_9) + $(am__append_4) $(am__append_7) $(am__append_10) \ + $(am__append_11) xjadeo_CFLAGS = -Wall -g -O3 @FFMPEG_CFLAGS@ @XV_CFLAGS@ @MIDI_CFLAGS@ \ @FREETYPE_CFLAGS@ @IMLIB2_CFLAGS@ @XPM_CFLAGS@ @LIBLO_CFLAGS@ \ @SDL_CFLAGS@ @LTC_CFLAGS@ @GL_CFLAGS@ @JACK_CFLAGS@ \ "-DSUBVERSION=\"$(REV)\"" "-DSHAREDIR=\"$(datadir)\"" \ - $(am__append_4) $(am__append_7) $(am__append_10) + $(am__append_6) $(am__append_9) $(am__append_12) xjadeo_OBJCFLAGS = -Wall -g -O3 \ @FFMPEG_CFLAGS@ @XV_CFLAGS@ @MIDI_CFLAGS@ @FREETYPE_CFLAGS@ @IMLIB2_CFLAGS@ @XPM_CFLAGS@ @LIBLO_CFLAGS@ @SDL_CFLAGS@ @LTC_CFLAGS@ @GL_CFLAGS@ @JACK_CFLAGS@ "-DSUBVERSION=\"$(REV)\"" @@ -424,7 +428,7 @@ icons/xjadeo8_ico.h icons/contrast_mask.xbm icons/hue_mask.xbm \ icons/xjadeo8.ico icons/saturation_mask.xbm icons/xjadeo8.xpm \ icons/saturation_mask.xbm icons/xjadeoH.ico \ - fonts/ArdourMono.ttf paths.h icons/xjadeoH.h $(am__append_11) + fonts/ArdourMono.ttf paths.h icons/xjadeoH.h $(am__append_13) xjremote_DEPENDENCIES = \ paths.h