Hello community,
here is the log from the commit of package xjadeo for openSUSE:Factory checked in at 2019-04-23 14:36:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xjadeo (Old)
and /work/SRC/openSUSE:Factory/.xjadeo.new.5536 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xjadeo"
Tue Apr 23 14:36:06 2019 rev:2 rq:696770 version:0.8.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/xjadeo/xjadeo.changes 2018-03-16 10:40:35.002448461 +0100
+++ /work/SRC/openSUSE:Factory/.xjadeo.new.5536/xjadeo.changes 2019-04-23 14:36:12.469478969 +0200
@@ -1,0 +2,9 @@
+Mon Apr 22 13:34:20 UTC 2019 - Luigi Baldoni
+
+- Update to version 0.8.9
+ * prefer -pthread over -lpthread, fixes #18
+ * mainly a build-system, binary only update
+ version 0.8.8
+ * use PortMidi default device (allow using portmidisetup)
+
+-------------------------------------------------------------------
Old:
----
xjadeo-0.8.7.tar.gz
New:
----
xjadeo-0.8.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xjadeo.spec ++++++
--- /var/tmp/diff_new_pack.RJotfx/_old 2019-04-23 14:36:12.985479312 +0200
+++ /var/tmp/diff_new_pack.RJotfx/_new 2019-04-23 14:36:12.985479312 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xjadeo
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 Packman Team
#
# All modifications and additions to the file contributed by third parties
@@ -13,15 +13,15 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: xjadeo
-Version: 0.8.7
+Version: 0.8.9
Release: 0
Summary: Video player that gets sync from Jack
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Productivity/Multimedia/Sound/Visualization
URL: http://xjadeo.sourceforge.net/
Source0: https://sourceforge.net/projects/xjadeo/files/xjadeo/v%{version}/%{name}-%{version}.tar.gz
++++++ xjadeo-0.8.7.tar.gz -> xjadeo-0.8.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/ChangeLog new/xjadeo-0.8.9/ChangeLog
--- old/xjadeo-0.8.7/ChangeLog 2016-11-28 13:37:31.000000000 +0100
+++ new/xjadeo-0.8.9/ChangeLog 2018-12-01 00:34:30.000000000 +0100
@@ -1,3 +1,12 @@
+2018-11-30 (0.8.9) Robin Gareus
+* prefer -pthread over -lpthread, fixes #18
+* mainly a build-system, binary only update
+
+2018-06-06 (0.8.8) Robin Gareus
+* use PortMidi default device (allow using portmidisetup)
+* fix loading fonts with non ASCII paths on Windows
+* allow verbose/debug logging on windows
+
2016-11-28 (0.8.7) Robin Gareus
* fix release builds (mistake in 0.8.6)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/config.guess new/xjadeo-0.8.9/config.guess
--- old/xjadeo-0.8.7/config.guess 2016-04-30 12:57:03.000000000 +0200
+++ new/xjadeo-0.8.9/config.guess 2016-11-12 21:18:52.000000000 +0100
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2016 Free Software Foundation, Inc.
-timestamp='2016-04-02'
+timestamp='2016-10-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
@@ -186,9 +186,12 @@
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
+ # to ELF recently (or will in the future) and ABI.
case "${UNAME_MACHINE_ARCH}" in
- arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ earm*)
+ os=netbsdelf
+ ;;
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
@@ -997,6 +1000,9 @@
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
+ mips64el:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
openrisc*:Linux:*:*)
echo or1k-unknown-linux-${LIBC}
exit ;;
@@ -1029,6 +1035,9 @@
ppcle:Linux:*:*)
echo powerpcle-unknown-linux-${LIBC}
exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
@@ -1408,18 +1417,17 @@
cat >&2 <http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
config.guess timestamp = $timestamp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/config.h new/xjadeo-0.8.9/config.h
--- old/xjadeo-0.8.7/config.h 2016-11-28 13:38:43.000000000 +0100
+++ new/xjadeo-0.8.9/config.h 2018-12-01 01:26:36.000000000 +0100
@@ -105,7 +105,7 @@
#define HAVE_PTHREAD_H 1
/* Define as 1 if you have the SDL toolkit (linux,netbsd,osx,win) */
-#define HAVE_SDL 1
+/* #undef HAVE_SDL */
/* Define to 1 if you have the header file. */
#define HAVE_STDINT_H 1
@@ -226,7 +226,7 @@
/* #undef TTFFONTFILE */
/* Version number of package */
-#define VERSION "0.8.7"
+#define VERSION "0.8.9"
/* enable xjadeo windows context-menu */
#define WINMENU 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/config.sub new/xjadeo-0.8.9/config.sub
--- old/xjadeo-0.8.7/config.sub 2016-04-30 12:57:03.000000000 +0200
+++ new/xjadeo-0.8.9/config.sub 2016-11-12 21:18:52.000000000 +0100
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2016 Free Software Foundation, Inc.
-timestamp='2016-03-30'
+timestamp='2016-11-04'
# 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
@@ -117,7 +117,7 @@
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | \
+ kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -301,6 +301,7 @@
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
@@ -428,6 +429,7 @@
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
@@ -643,6 +645,14 @@
basic_machine=m68k-bull
os=-sysv3
;;
+ e500v[12])
+ basic_machine=powerpc-unknown
+ os=$os"spe"
+ ;;
+ e500v[12]-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=$os"spe"
+ ;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
@@ -1022,7 +1032,7 @@
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
+ ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
@@ -1032,7 +1042,7 @@
;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
@@ -1389,7 +1399,7 @@
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1399,7 +1409,7 @@
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos*)
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/configure new/xjadeo-0.8.9/configure
--- old/xjadeo-0.8.7/configure 2016-11-28 13:38:40.000000000 +0100
+++ new/xjadeo-0.8.9/configure 2018-12-01 01:26:32.000000000 +0100
@@ -2740,7 +2740,7 @@
VERSION_MAJOR=0
VERSION_MINOR=8
-VERSION_SUB=7
+VERSION_SUB=9
am__api_version='1.15'
@@ -6860,7 +6860,7 @@
$as_echo "$ac_cv_lib_rt_mq_open" >&6; }
if test "x$ac_cv_lib_rt_mq_open" = xyes; then :
$as_echo "#define HAVE_MQ 1" >>confdefs.h
- MQ_LIBS="-lrt -lpthread" HAVE_MQ=1
+ MQ_LIBS="-lrt" HAVE_MQ=1
fi
fi
@@ -7544,7 +7544,7 @@
HAVE_MIDI=1
ALSA_SEQ_MIDI=1
ALSA_RAW_MIDI=1
- MIDI_LIBS="$MIDI_LIBS -lasound -lpthread"
+ MIDI_LIBS="$MIDI_LIBS -lasound"
fi
if test "x$FOUND_H_PORTMIDI$FOUND_L_PORTMIDI" = "xyesyes"; then
$as_echo "#define HAVE_MIDI 1" >>confdefs.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/configure.ac new/xjadeo-0.8.9/configure.ac
--- old/xjadeo-0.8.7/configure.ac 2016-11-28 13:36:59.000000000 +0100
+++ new/xjadeo-0.8.9/configure.ac 2018-12-01 00:33:14.000000000 +0100
@@ -8,7 +8,7 @@
VERSION_MAJOR=0
VERSION_MINOR=8
-VERSION_SUB=7
+VERSION_SUB=9
AM_INIT_AUTOMAKE(xjadeo, [${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUB}])
AM_CONFIG_HEADER(config.h)
@@ -229,7 +229,7 @@
dnl remote control..
MQ_LIBS=""
if test "x$enable_mq" != "xno"; then
- AC_CHECK_LIB(rt, mq_open, [AC_DEFINE(HAVE_MQ) MQ_LIBS="-lrt -lpthread" HAVE_MQ=1])
+ AC_CHECK_LIB(rt, mq_open, [AC_DEFINE(HAVE_MQ) MQ_LIBS="-lrt" HAVE_MQ=1])
fi
AC_SUBST(MQ_LIBS)
AC_DEFINE(MQLEN, 512, [ max length of a remote control line. ])
@@ -321,7 +321,7 @@
HAVE_MIDI=1
ALSA_SEQ_MIDI=1
ALSA_RAW_MIDI=1
- MIDI_LIBS="$MIDI_LIBS -lasound -lpthread"
+ MIDI_LIBS="$MIDI_LIBS -lasound"
fi
if test "x$FOUND_H_PORTMIDI$FOUND_L_PORTMIDI" = "xyesyes"; then
AC_DEFINE(HAVE_MIDI)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/doc/xjadeo.1 new/xjadeo-0.8.9/doc/xjadeo.1
--- old/xjadeo-0.8.7/doc/xjadeo.1 2016-11-28 13:38:50.000000000 +0100
+++ new/xjadeo-0.8.9/doc/xjadeo.1 2018-12-01 01:26:44.000000000 +0100
@@ -1,5 +1,5 @@
.\" 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"
+.TH XJADEO "1" "December 2018" "xjadeo version 0.8.9" "User Commands"
.SH NAME
xjadeo \- X Jack Video Monitor
.SH SYNOPSIS
@@ -356,14 +356,14 @@
Website: http://xjadeo.sf.net/
.TP
built from:
-scm\-v0.8.7
+scm\-v0.8.9
.IP
-compiled with: AVFORMAT=0x392964 AVCODEC=0x393065 AVUTIL:0x371c64
+compiled with: AVFORMAT=0x393865 AVCODEC=0x394065 AVUTIL:0x372265
configuration: [ LTC JACK\-SESSION POSIX\-MQueue OSC ]
.br
MTC/MIDI: [ jack\-midi alsa\-sequencer portmidi alsa\-raw ]
.br
-Display(s): [ openGL Xv SDL X11/imlib2(RGBA32) ]
+Display(s): [ openGL Xv X11/imlib2(RGBA32) ]
.SH COPYRIGHT
Copyright \(co GPL 2006\-2015 Robin Gareus
.br
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/doc/xjremote.1 new/xjadeo-0.8.9/doc/xjremote.1
--- old/xjadeo-0.8.7/doc/xjremote.1 2016-11-28 13:38:50.000000000 +0100
+++ new/xjadeo-0.8.9/doc/xjremote.1 2018-12-01 01:26:44.000000000 +0100
@@ -1,5 +1,5 @@
.\" 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"
+.TH XJREMOTE "1" "December 2018" "xjremote version 0.8.9" "User Commands"
.SH NAME
xjremote \- X Jack Video Monitor Remote Control
.SH SYNOPSIS
@@ -54,7 +54,7 @@
Website: https://github.com/x42/xjadeo
.TP
built from:
-scm\-v0.8.7
+scm\-v0.8.9
.TP
configuration:
[ POSIX\-MQueue ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/src/qt-gui/qjadeo_fr.ts new/xjadeo-0.8.9/src/qt-gui/qjadeo_fr.ts
--- old/xjadeo-0.8.7/src/qt-gui/qjadeo_fr.ts 2015-11-10 21:54:37.000000000 +0100
+++ new/xjadeo-0.8.9/src/qt-gui/qjadeo_fr.ts 2017-01-14 16:16:11.000000000 +0100
@@ -5,11 +5,11 @@
<name>ImportDialog</name>
<message>
<source>Import - Convert Video File</source>
- <translation>Importer - Convertir Fichier Video</translation>
+ <translation>Importer - convertir un fichier vidéo</translation>
</message>
<message>
<source>Video File</source>
- <translation>Fichier Video</translation>
+ <translation>Fichier vidéo</translation>
</message>
<message>
<source>Source:</source>
@@ -17,7 +17,7 @@
</message>
<message>
<source>File Info:</source>
- <translation>Info Fichier :</translation>
+ <translation>Info sur le fichier :</translation>
</message>
<message>
<source>Destination:</source>
@@ -25,7 +25,7 @@
</message>
<message>
<source>Encoder Settings</source>
- <translation>Paramètres de l'Encodeur</translation>
+ <translation>Paramètres de l'encodeur</translation>
</message>
<message>
<source>Width:</source>
@@ -33,7 +33,7 @@
</message>
<message>
<source>Scale</source>
- <translation>Echelle</translation>
+ <translation>Échelle</translation>
</message>
<message>
<source>Height:</source>
@@ -41,7 +41,7 @@
</message>
<message>
<source>Break Aspect Ratio</source>
- <translation>Casser le Ratio d'Aspect</translation>
+ <translation>Casser le ratio d'aspect</translation>
</message>
<message>
<source>FPS:</source>
@@ -65,7 +65,7 @@
</message>
<message>
<source>Resample</source>
- <translation>Rééchantillonner</translation>
+ <translation>Ré-échantillonner</translation>
</message>
<message>
<source>extra mencoder options</source>
@@ -92,7 +92,7 @@
<name>ImportProgress</name>
<message>
<source>Transcoding Video File</source>
- <translation>Transcodage du Fichier Video</translation>
+ <translation>Transcodage du fichier vidéo</translation>
</message>
<message>
<source>Cancel</source>
@@ -155,7 +155,7 @@
</message>
<message>
<source>&Close xjadeo and Exit</source>
- <translation>&Fermer xjadeo et Quitter</translation>
+ <translation>&Fermer xjadeo et quitter</translation>
</message>
<message>
<source>About</source>
@@ -203,7 +203,7 @@
</message>
<message>
<source>Frame number</source>
- <translation>Numéro de Trame</translation>
+ <translation>Numéro de trame</translation>
</message>
<message>
<source>Box</source>
@@ -243,7 +243,7 @@
</message>
<message>
<source>Disconnect and &Exit</source>
- <translation>Déconnecter et &Quitter</translation>
+ <translation>Déconnecter et &quitter</translation>
</message>
<message>
<source>to any frame</source>
@@ -271,7 +271,7 @@
</message>
<message>
<source>Letterbox</source>
- <translation>Letterbox</translation>
+ <translation>Boîte aux lettres</translation>
</message>
<message>
<source>Resize to aspect-ratio</source>
@@ -294,11 +294,11 @@
</message>
<message>
<source>Autoconnect ALSA Midi port (MTC):</source>
- <translation>Se connecter automatiquement ce port ALSA Midi (MTC) :</translation>
+ <translation>Se connecter automatiquement au port ALSA Midi (MTC) :</translation>
</message>
<message>
<source>Autoconnect JACK Midi port (MTC):</source>
- <translation>Se connecter automatiquement ce port JACK Midi (MTC) :</translation>
+ <translation>Se connecter automatiquement au port JACK Midi (MTC) :</translation>
</message>
<message>
<source>xjadeo/xjremote executable:</source>
@@ -314,11 +314,11 @@
</message>
<message>
<source>Import Settings</source>
- <translation>Paramètres d'Importation</translation>
+ <translation>Paramètres d'importation</translation>
</message>
<message>
<source>Import to Codec:</source>
- <translation>Importer vers le Codec :</translation>
+ <translation>Importer vers le codec :</translation>
</message>
<message>
<source>mpeg4</source>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/src/xjadeo/Makefile.am new/xjadeo-0.8.9/src/xjadeo/Makefile.am
--- old/xjadeo-0.8.7/src/xjadeo/Makefile.am 2016-07-05 16:56:49.000000000 +0200
+++ new/xjadeo-0.8.9/src/xjadeo/Makefile.am 2018-11-29 19:12:25.000000000 +0100
@@ -21,9 +21,9 @@
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
-xjadeo_CFLAGS = -Wall -g -O3 \
+xjadeo_CFLAGS = -Wall -g -O3 -pthread \
@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)\""
-xjadeo_OBJCFLAGS = -Wall -g -O3 \
+xjadeo_OBJCFLAGS = -Wall -g -O3 -pthread \
@FFMPEG_CFLAGS@ @XV_CFLAGS@ @MIDI_CFLAGS@ @FREETYPE_CFLAGS@ @IMLIB2_CFLAGS@ @XPM_CFLAGS@ @LIBLO_CFLAGS@ @SDL_CFLAGS@ @LTC_CFLAGS@ @GL_CFLAGS@ @JACK_CFLAGS@ "-DSUBVERSION=\"$(REV)\""
if TARGET_LINUX
@@ -48,7 +48,7 @@
xjremote_SOURCES = xjremote.c
-xjremote_CFLAGS = "-DSUBVERSION=\"$(REV)\""
+xjremote_CFLAGS = -pthread "-DSUBVERSION=\"$(REV)\""
xjremote_LDADD = @MQ_LIBS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/src/xjadeo/Makefile.in new/xjadeo-0.8.9/src/xjadeo/Makefile.in
--- old/xjadeo-0.8.7/src/xjadeo/Makefile.in 2016-11-28 13:38:45.000000000 +0100
+++ new/xjadeo-0.8.9/src/xjadeo/Makefile.in 2018-12-01 01:26:37.000000000 +0100
@@ -407,17 +407,18 @@
@SDL_LIBS@ @LTC_LIBS@ @GL_LIBS@ -lm $(am__append_2) \
$(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_6) $(am__append_9) $(am__append_12)
-xjadeo_OBJCFLAGS = -Wall -g -O3 \
+xjadeo_CFLAGS = -Wall -g -O3 -pthread @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_6) $(am__append_9) \
+ $(am__append_12)
+xjadeo_OBJCFLAGS = -Wall -g -O3 -pthread \
@FFMPEG_CFLAGS@ @XV_CFLAGS@ @MIDI_CFLAGS@ @FREETYPE_CFLAGS@ @IMLIB2_CFLAGS@ @XPM_CFLAGS@ @LIBLO_CFLAGS@ @SDL_CFLAGS@ @LTC_CFLAGS@ @GL_CFLAGS@ @JACK_CFLAGS@ "-DSUBVERSION=\"$(REV)\""
@TARGET_WIN32_TRUE@xjadeo_LDFLAGS = -mwindows
xjremote_SOURCES = xjremote.c
-xjremote_CFLAGS = "-DSUBVERSION=\"$(REV)\""
+xjremote_CFLAGS = -pthread "-DSUBVERSION=\"$(REV)\""
xjremote_LDADD = @MQ_LIBS@
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = paths.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/src/xjadeo/display_gl_win.c new/xjadeo-0.8.9/src/xjadeo/display_gl_win.c
--- old/xjadeo-0.8.7/src/xjadeo/display_gl_win.c 2015-11-10 21:54:37.000000000 +0100
+++ new/xjadeo-0.8.9/src/xjadeo/display_gl_win.c 2018-10-10 15:48:42.000000000 +0200
@@ -1008,10 +1008,10 @@
if (action==2) hide_mouse ^= 1;
else hide_mouse = action ? 1 : 0;
if (hide_mouse) {
- SetClassLong(_gl_hwnd, GCL_HCURSOR, (LONG)hCurs_none);
+ SetClassLong(_gl_hwnd, GCLP_HCURSOR, (LONG)hCurs_none);
SetCursor(hCurs_none);
} else {
- SetClassLong(_gl_hwnd, GCL_HCURSOR, (LONG)hCurs_dflt);
+ SetClassLong(_gl_hwnd, GCLP_HCURSOR, (LONG)hCurs_dflt);
SetCursor(hCurs_dflt);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/src/xjadeo/main.c new/xjadeo-0.8.9/src/xjadeo/main.c
--- old/xjadeo-0.8.7/src/xjadeo/main.c 2015-11-22 13:00:15.000000000 +0100
+++ new/xjadeo-0.8.9/src/xjadeo/main.c 2017-03-08 16:35:45.000000000 +0100
@@ -949,6 +949,62 @@
return NULL;
}
+#if defined PLATFORM_WINDOWS
+static FILE* pStdOut = 0;
+static FILE* pStdErr = 0;
+static BOOL bConsole;
+static HANDLE hStdOut;
+
+static int
+IsAConsolePort (HANDLE handle)
+{
+ DWORD mode;
+ return (GetConsoleMode(handle, &mode) != 0);
+}
+
+static void
+console_madness_begin ()
+{
+ bConsole = AttachConsole(ATTACH_PARENT_PROCESS);
+ hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
+
+ /* re-attach to the console so we can see 'printf()' output etc. */
+ if ((bConsole) && (IsAConsolePort(hStdOut))) {
+ pStdOut = freopen( "CONOUT$", "w", stdout );
+ pStdErr = freopen( "CONOUT$", "w", stderr );
+ }
+}
+
+static void
+console_madness_end ()
+{
+ if (pStdOut) {
+ fclose (pStdOut);
+ }
+ if (pStdErr) {
+ fclose (pStdErr);
+ }
+
+ if (bConsole) {
+ /* Detach and free the console from our application, and line feed */
+ INPUT_RECORD input_record;
+
+ input_record.EventType = KEY_EVENT;
+ input_record.Event.KeyEvent.bKeyDown = TRUE;
+ input_record.Event.KeyEvent.dwControlKeyState = 0;
+ input_record.Event.KeyEvent.uChar.UnicodeChar = VK_RETURN;
+ input_record.Event.KeyEvent.wRepeatCount = 1;
+ input_record.Event.KeyEvent.wVirtualKeyCode = VK_RETURN;
+ input_record.Event.KeyEvent.wVirtualScanCode = MapVirtualKey( VK_RETURN, 0 );
+
+ DWORD written = 0;
+ WriteConsoleInput( GetStdHandle( STD_INPUT_HANDLE ), &input_record, 1, &written );
+
+ FreeConsole();
+ }
+}
+#endif
+
#if defined PLATFORM_WINDOWS && defined USE_WINMAIN
@@ -1003,6 +1059,10 @@
int i;
char *movie;
+#ifdef PLATFORM_WINDOWS
+ console_madness_begin ();
+#endif
+
xjadeorc(); // read config files - default values before parsing cmd line.
#ifdef PLATFORM_OSX
@@ -1062,7 +1122,7 @@
strcpy(OSD_fontfile, path);
strcat(OSD_fontfile, "\\" FONT_FILE);
} else {
- GetModuleFileNameW(NULL, (LPWCH)path, MAX_PATH);
+ GetModuleFileName(NULL, (LPWCH)path, MAX_PATH);
char *tmp;
if ((tmp = strrchr(path, '\\'))) *tmp = 0;
strcpy(OSD_fontfile, path);
@@ -1115,5 +1175,9 @@
#endif
clean_up(0);
+
+#ifdef PLATFORM_WINDOWS
+ console_madness_end ();
+#endif
return (0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/src/xjadeo/midi.c new/xjadeo-0.8.9/src/xjadeo/midi.c
--- old/xjadeo-0.8.7/src/xjadeo/midi.c 2015-11-10 21:54:37.000000000 +0100
+++ new/xjadeo-0.8.9/src/xjadeo/midi.c 2018-06-05 22:17:51.000000000 +0200
@@ -232,24 +232,22 @@
#define INPUT_BUFFER_SIZE 0
static int pm_midi_detectdevices (int print) {
- int midiid=-1;
int i;
-
- // id = Pm_GetDefaultInputDeviceID(); <- use this as default ??
+ int midiid = Pm_GetDefaultInputDeviceID();
/* list device information */
for (i = 0; i < Pm_CountDevices(); i++) {
const PmDeviceInfo *info = Pm_GetDeviceInfo(i);
if (info->input) {
- if(midiid==-1) { midiid=i; }
+ if(midiid == pmNoDevice) { midiid=i; }
}
if (print) {
printf("%d: %s, %s", i, info->interf, info->name);
if (info->input) printf(" (input)");
if (info->output) printf(" (output)");
- if(midiid==i) printf(" (*)");
+ if(midiid == i) printf(" (*)");
printf("\n");
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.7/src/xjadeo/mqueue.c new/xjadeo-0.8.9/src/xjadeo/mqueue.c
--- old/xjadeo-0.8.7/src/xjadeo/mqueue.c 2015-11-10 21:54:37.000000000 +0100
+++ new/xjadeo-0.8.9/src/xjadeo/mqueue.c 2018-06-05 23:17:39.000000000 +0200
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include