1 --- avidemux_2.6.9/avidemux/gtk/CMakeLists.txt~ 2015-05-24 11:48:10.000000000 +0200
2 +++ avidemux_2.6.9/avidemux/gtk/CMakeLists.txt 2015-05-24 11:56:38.844485490 +0200
4 ADD_SUBDIRECTORY(ADM_userInterfaces ./ADM_userInterfacesGtk)
6 SDLify(../common/main.cpp)
7 -ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
8 +ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"" "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")
10 ###########################################
12 --- avidemux_2.6.11/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_gtkRender.cpp.orig 2016-01-30 08:54:43.917653247 +0100
13 +++ avidemux_2.6.11/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_gtkRender.cpp 2016-01-30 10:22:47.504098179 +0100
15 xinfo->display = (void*)GDK_WINDOW_HWND(win);
16 #elif defined(__APPLE__)
18 - xinfo->window = getMainNSWindow();
19 + xinfo->systemWindowId = getMainNSWindow();
21 - xinfo->window = GDK_WINDOW_XID(win);
22 + xinfo->systemWindowId = GDK_WINDOW_XID(win);
23 xinfo->display = GDK_WINDOW_XDISPLAY(parentWin);
26 --- avidemux_2.6.11/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_bindings.cpp.orig 2016-01-30 10:29:43.714080713 +0100
27 +++ avidemux_2.6.11/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_bindings.cpp 2016-01-30 19:32:06.962714994 +0100
28 @@ -1387,6 +1387,19 @@
38 + UI_setVideoCodec(0);
39 + UI_setAudioCodec(0);
40 + UI_setCurrentPreview(false);
46 * \brief Entry point. Initialize renderLib.
48 @@ -1596,6 +1596,15 @@
52 + * \fn UI_setDisplayName
53 + * \brief display current displayEngine name
55 +bool UI_setDisplayName(const char *name)