Skip to content

Commit

Permalink
Complete re-compile. Upgrade everything. New patches.
Browse files Browse the repository at this point in the history
  • Loading branch information
Warblefly committed Jul 2, 2017
1 parent bcacd76 commit 105ae87
Show file tree
Hide file tree
Showing 6 changed files with 217 additions and 49 deletions.
123 changes: 74 additions & 49 deletions cross_compile_ffmpeg_shared.sh

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions icu-59.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
--- source/common/putil.cpp.orig 2017-06-28 12:42:45.288231700 +0100
+++ source/common/putil.cpp 2017-06-28 12:43:38.962309100 +0100
@@ -101,15 +101,15 @@
# define NOIME
# define NOMCX
# include <windows.h>
-# include "unicode\uloc.h"
+# include "unicode/uloc.h"
#if U_PLATFORM_HAS_WINUWP_API == 0
# include "wintz.h"
#else // U_PLATFORM_HAS_WINUWP_API
typedef PVOID LPMSG; // TODO: figure out how to get rid of this typedef
#include <Windows.Globalization.h>
#include <windows.system.userprofile.h>
-#include <wrl\wrappers\corewrappers.h>
-#include <wrl\client.h>
+#include <wrl/wrappers/corewrappers.h>
+#include <wrl/client.h>

using namespace ABI::Windows::Foundation;
using namespace Microsoft::WRL;
--- source/io/ufile.cpp.orig 2017-06-28 13:19:05.735098800 +0100
+++ source/io/ufile.cpp 2017-06-28 13:20:03.368163800 +0100
@@ -160,7 +160,7 @@
// TODO: test this code path, including wperm.
wchar_t wperm[40] = {};
size_t retVal;
- mbstowcs_s(&retVal, wperm, perm, _TRUNCATE);
+ mbstowcs_s(&retVal, wperm, 40, perm, _TRUNCATE);
FILE *systemFile = _wfopen((const wchar_t *)filename, wperm);
if (systemFile) {
result = finit_owner(systemFile, locale, codepage, TRUE);
--- source/tools/toolutil/pkg_genc.cpp.orig 2017-06-28 13:33:21.383757100 +0100
+++ source/tools/toolutil/pkg_genc.cpp 2017-06-28 13:33:43.285760600 +0100
@@ -43,6 +43,7 @@
#include "cmemory.h"
#include "cstring.h"
#include "filestrm.h"
+#include "filetools.h"
#include "toolutil.h"
#include "unicode/uclean.h"
#include "uoptions.h"
20 changes: 20 additions & 0 deletions libssh-ctx-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- src/wrapper.c.orig 2017-06-28 19:36:37.471261100 +0100
+++ src/wrapper.c 2017-06-28 19:38:45.920689700 +0100
@@ -120,14 +120,12 @@
SAFE_FREE(cipher->key);
}
#endif
- if (cipher->ctx != NULL) {
- if (cipher->cleanup != NULL) {
- cipher->cleanup(cipher);
+ if (cipher->cleanup != NULL) {
+ cipher->cleanup(cipher);
}
#ifdef HAVE_LIBCRYPTO
- EVP_CIPHER_CTX_free(cipher->ctx);
+ EVP_CIPHER_CTX_free(cipher->ctx);
#endif
- }
}

static void cipher_free(struct ssh_cipher_struct *cipher) {
40 changes: 40 additions & 0 deletions mpv.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# MPV run-time configration file by john@johnwarburton.net
# These are my personal settings, for an Intel Skylake processor
# with on-board graphics.
#
# Give priority to presentation
priority=realtime
# Reduce juddering when incoming framerate != display framerate
interpolation=yes
# Tell mpv to do its best to find a hardware decoder
hwdec=auto
# Resample audio to keep sync if video frames temporally drift
video-sync=display-resample
# Force spinning off the demuxer into its own thread
demuxer-thread=yes
# Try to seek on every file.
force-seekable=yes
# Rescale algorithm. Needs a reaonsably powerful graphics chip
scale=ewa_lanczossharp
# On screen display parameters
osd-duration=200
osd-fractions
osd-level=1
osd-font-size=14
# Type Shift-O to see all sorts of useful information about the media
osd-msg3="${media-title}\nbv:${video-bitrate} vp:${video-params} a:${audio-bitrate} cn:${audio-codec} ${audio-params}\nvc:${video-codec}\n ${video-format} \nf:${container-fps} j:${vsync-jitter} d:${drop-frame-count} m:${mistimed-frame-count} s:${vsync-ratio} ch:${demuxer-cache-time}s\nhw:${hwdec-current} hwI:${hwdec-interop} p:${vo-performance}\n${metadata}"
# Window displays no border
no-border
# For audio-only items, still show a window; hence have control
force-window
# Lots of cache
cache=8000
cache-secs=20
demuxer-readahead-secs=40
prefetch-playlist=yes
demuxer-max-bytes=160000000
# Save screenshots losslessly
screenshot-format=png
screenshot-tag-colorspace=yes
screenshot-png-compression=9

26 changes: 26 additions & 0 deletions qt5-no-mapbox-gl-native.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--- qtlocation/src/plugins/geoservices/geoservices.pro.orig 2017-06-30 13:44:30.320673100 +0100
+++ qtlocation/src/plugins/geoservices/geoservices.pro 2017-06-30 13:44:44.912530500 +0100
@@ -5,12 +5,3 @@
qtConfig(concurrent) {
SUBDIRS += osm
}
-
-qtConfig(c++14):qtConfig(c++14):!win32|mingw:!qnx {
- !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
- warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
- } else {
- SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native
- mapboxgl.depends = ../../3rdparty/mapbox-gl-native
- }
-}
--- qtmultimedia/src/plugins/common/evr/evrd3dpresentengine.cpp.orig 2017-07-01 23:01:19.486015500 +0100
+++ qtmultimedia/src/plugins/common/evr/evrd3dpresentengine.cpp 2017-07-01 23:02:15.154010700 +0100
@@ -49,7 +49,7 @@
#include <private/qmediaopenglhelper_p.h>

#ifdef MAYBE_ANGLE
-# include <qtgui/qguiapplication.h>
+# include <QtGui/qguiapplication.h>
# include <qpa/qplatformnativeinterface.h>
# include <qopenglfunctions.h>
# include <EGL/eglext.h>
15 changes: 15 additions & 0 deletions synaesthesia-missing-icon.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- Makefile.am.orig 2017-07-02 12:13:59.151539800 +0100
+++ Makefile.am 2017-07-02 12:14:17.395930400 +0100
@@ -63,12 +63,3 @@
CLEANFILES = synaesthesia.ico syn_icon.rgb syn_icon_rgb.cc \
synaesthesia.js synaesthesia.html.mem a.out.js

-install:
- -xdg-icon-resource install --novendor --context apps \
- --size 256 synaesthesia.png synaesthesia
- -xdg-desktop-menu install --novendor synaesthesia.desktop
-
-uninstall:
- -xdg-icon-resource uninstall --novendor --context apps \
- --size 256 synaesthesia
- -xdg-desktop-menu uninstall --novendor synaesthesia.desktop

0 comments on commit 105ae87

Please sign in to comment.