From 929d6041f2a627cec2d3ddac85bcf94e4a6ce963 Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Sun, 5 Mar 2017 20:09:26 +0300 Subject: [PATCH 01/11] xine-lib:version bump --- multimedia/video/xine-lib/pspec.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/multimedia/video/xine-lib/pspec.xml b/multimedia/video/xine-lib/pspec.xml index b7e7c6e841..b84674781b 100644 --- a/multimedia/video/xine-lib/pspec.xml +++ b/multimedia/video/xine-lib/pspec.xml @@ -12,7 +12,7 @@ library Core libraries for Xine movie player This package contains the Xine library. It can be used to play back various media, decode multimedia files from local disk drives, and display multimedia streamed over the Internet. It interprets many of the most common multimedia formats available - and some uncommon formats, too. - http://sourceforge.net/projects/xine/files/xine-lib/1.2.6/xine-lib-1.2.6.tar.xz + http://sourceforge.net/projects/xine/files/xine-lib/1.2.8/xine-lib-1.2.8.tar.xz accel_vaapi.h @@ -57,9 +57,9 @@ libvdpau-devel - xine-lib-ffmpeg3.patch + list.patch - multilib.patch + no_autopoint.patch dmo.patch tr_segfault_fix.patch @@ -136,6 +136,13 @@ + + 2017-03-05 + 1.2.8 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2016-06-14 1.2.6 From e71830e085ae96161445b2585e34b75fb2e52fdf Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Sun, 5 Mar 2017 20:10:22 +0300 Subject: [PATCH 02/11] imlib2:rebuild --- multimedia/graphics/imlib2/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/multimedia/graphics/imlib2/pspec.xml b/multimedia/graphics/imlib2/pspec.xml index b0fb3c174d..86040e60c3 100644 --- a/multimedia/graphics/imlib2/pspec.xml +++ b/multimedia/graphics/imlib2/pspec.xml @@ -63,6 +63,13 @@ + + 2017-03-05 + 1.4.9 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2017-02-05 1.4.9 From bb7cffbf090cb2ca9e44f5e2526f9b74fe378e0f Mon Sep 17 00:00:00 2001 From: suvari Date: Sun, 5 Mar 2017 20:29:59 +0300 Subject: [PATCH 03/11] python-qt5: version bump to 5.7.1 --- .../language/python/python-qt5/pspec.xml | 81 +++++++++++-------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml index e967062199..2612e4b369 100644 --- a/programming/language/python/python-qt5/pspec.xml +++ b/programming/language/python/python-qt5/pspec.xml @@ -13,29 +13,32 @@ library A set of Python bindings for the Qt 5.x Toolkit Qt is a set of C++ libraries and development tools that includes platform independent abstractions for graphical user interfaces, networking, threads, Unicode, regular expressions, SQL databases, SVG, OpenGL, XML, and user and application settings. PyQt implements 440 of these classes as a set of Python modules. - mirrors://sourceforge/pyqt/PyQt5/PyQt-5.6/PyQt5_gpl-5.6.tar.gz + mirrors://sourceforge/pyqt/PyQt5/PyQt-5.7/PyQt5_gpl-5.7.1.tar.gz dbus-devel + dbus-python dbus-python-common python-devel - python-sip - qt5-base-devel - qt5-connectivity-devel - qt5-declarative-devel - qt5-enginio-devel - qt5-location-devel - qt5-multimedia-devel - qt5-sensors-devel - qt5-serialport-devel - qt5-svg-devel - qt5-webchannel-devel - qt5-webkit-devel - qt5-websockets-devel - qt5-x11extras-devel - qt5-xmlpatterns-devel + python-sip + qt5-base-devel + qt5-connectivity-devel + qt5-declarative-devel + qt5-location-devel + qt5-multimedia-devel + qt5-sensors-devel + qt5-serialport-devel + qt5-svg-devel + qt5-webchannel-devel + qt5-webkit-devel + qt5-websockets-devel + qt5-x11extras-devel + qt5-xmlpatterns-devel + qt5-quickcontrols2-devel + qt5-script-devel + qt5-designer-devel - PyQt5_gpl-5.6-dbus_ftbfs.patch + @@ -46,29 +49,30 @@ libgcc dbus python - qt5-base - qt5-sensors - qt5-location - qt5-webkit - qt5-enginio - qt5-x11extras - qt5-svg - qt5-multimedia - qt5-serialport - qt5-webchannel - qt5-websockets - qt5-declarative - qt5-xmlpatterns - qt5-connectivity + qt5-base + qt5-sensors + qt5-location + qt5-webkit + qt5-x11extras + qt5-svg + qt5-multimedia + qt5-serialport + qt5-webchannel + qt5-websockets + qt5-declarative + qt5-xmlpatterns + qt5-connectivity + qt5-designer python-sip /usr/bin/py2uic5 /usr/lib/python2.7/site-packages /usr/lib/qt5/plugins/PyQt5/libpy2qt5qmlplugin.so - /usr/share/qt5/qsci/api/python/Py2Qt5.api + /usr/lib/qt5/plugins/designer/libpyqt5.so + /usr/share/qt5/qsci/api/python/Py2Qt5.api /usr/bin/py2rcc5 - /usr/bin/py2lupdate5 + /usr/bin/py2lupdate5 @@ -77,7 +81,7 @@ Development files for python3-qt5 libgcc - qt5-base + qt5-base python-qt5 @@ -86,6 +90,13 @@ + + 2017-03-05 + 5.7.1 + Version Bump + Kamil Atlı + suvari@pisilinux.org + 2016-06-09 5.6 @@ -115,4 +126,4 @@ ayhanyalcinsoy@pisilinux.org - + \ No newline at end of file From f1edca4765c7799b7222fa6f6328c5c6712e41a8 Mon Sep 17 00:00:00 2001 From: suvari Date: Sun, 5 Mar 2017 20:57:38 +0300 Subject: [PATCH 04/11] python-qt5: fix source --- programming/language/python/python-qt5/pspec.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml index 2612e4b369..4113862ef3 100644 --- a/programming/language/python/python-qt5/pspec.xml +++ b/programming/language/python/python-qt5/pspec.xml @@ -13,7 +13,7 @@ library A set of Python bindings for the Qt 5.x Toolkit Qt is a set of C++ libraries and development tools that includes platform independent abstractions for graphical user interfaces, networking, threads, Unicode, regular expressions, SQL databases, SVG, OpenGL, XML, and user and application settings. PyQt implements 440 of these classes as a set of Python modules. - mirrors://sourceforge/pyqt/PyQt5/PyQt-5.7/PyQt5_gpl-5.7.1.tar.gz + mirrors://sourceforge/pyqt/PyQt5/PyQt-5.7.1/PyQt5_gpl-5.7.1.tar.gz dbus-devel dbus-python @@ -78,7 +78,7 @@ python-qt5-devel - Development files for python3-qt5 + Development files for python-qt5 libgcc qt5-base From 6727c3669d572f5d6199bc3f9761638dedd0d295 Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Sun, 5 Mar 2017 22:13:58 +0300 Subject: [PATCH 05/11] vlc:add patch --- multimedia/video/vlc/actions.py | 1 + .../vlc/files/vlc-2.2.2-qt5widgets.patch | 13 + .../files/vlc-2.2.4-alsa-large-buffers.patch | 47 +++ .../video/vlc/files/vlc-2.2.4-cxx0x.patch | 11 + .../files/vlc-2.2.4-decoder-lock-scope.patch | 47 +++ .../vlc/files/vlc-2.2.4-libav-11.7.patch | 9 + .../video/vlc/files/vlc-2.2.4-qt57.patch | 284 +++++++++++++ .../files/vlc-9999-libva-1.2.1-compat.patch | 12 + .../video/vlc/files/vlc-gcc6-buildfixes.patch | 388 ++++++++++++++++++ multimedia/video/vlc/pspec.xml | 10 +- 10 files changed, 821 insertions(+), 1 deletion(-) create mode 100644 multimedia/video/vlc/files/vlc-2.2.2-qt5widgets.patch create mode 100644 multimedia/video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch create mode 100644 multimedia/video/vlc/files/vlc-2.2.4-cxx0x.patch create mode 100644 multimedia/video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch create mode 100644 multimedia/video/vlc/files/vlc-2.2.4-libav-11.7.patch create mode 100644 multimedia/video/vlc/files/vlc-2.2.4-qt57.patch create mode 100644 multimedia/video/vlc/files/vlc-9999-libva-1.2.1-compat.patch create mode 100644 multimedia/video/vlc/files/vlc-gcc6-buildfixes.patch diff --git a/multimedia/video/vlc/actions.py b/multimedia/video/vlc/actions.py index b184d4e9b0..5b14131d9d 100644 --- a/multimedia/video/vlc/actions.py +++ b/multimedia/video/vlc/actions.py @@ -27,6 +27,7 @@ def setup(): --with-x \ LUAC=luac LUA_LIBS='`pkg-config --libs lua`' \ RCC=/usr/bin/rcc-qt5 \ + --disable-qt4 \ --disable-asdcp \ --disable-coverage \ --disable-cprof \ diff --git a/multimedia/video/vlc/files/vlc-2.2.2-qt5widgets.patch b/multimedia/video/vlc/files/vlc-2.2.2-qt5widgets.patch new file mode 100644 index 0000000000..a024d0032b --- /dev/null +++ b/multimedia/video/vlc/files/vlc-2.2.2-qt5widgets.patch @@ -0,0 +1,13 @@ +--- vlc-2.2.2/configure.ac ++++ vlc-2.2.2/configure.ac +@@ -3754,10 +3754,6 @@ + AC_MSG_WARN([Not building Qt Interface with X11 helpers.]) + ]) + +- PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [ +- AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"]) +- ]) +- + QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)" + QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)" + AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) diff --git a/multimedia/video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch b/multimedia/video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch new file mode 100644 index 0000000000..1606dfd98b --- /dev/null +++ b/multimedia/video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch @@ -0,0 +1,47 @@ +X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faudio_output%2Falsa.c;h=4e9fd53592d048baa8b57f30df15ab5806139d07;hp=2d1f99e9cb743bca12c6bdf32cc84a92d07fda8b;hb=47f74a83c161173b0d15e95dab8ceb7c97de51b4;hpb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a + +diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c +index 2d1f99e..4e9fd53 100644 +--- a/modules/audio_output/alsa.c ++++ b/modules/audio_output/alsa.c +@@ -495,6 +495,15 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) + } + sys->rate = fmt->i_rate; + ++#if 1 /* work-around for period-long latency outputs (e.g. PulseAudio): */ ++ param = AOUT_MIN_PREPARE_TIME; ++ val = snd_pcm_hw_params_set_period_time_near (pcm, hw, ¶m, NULL); ++ if (val) ++ { ++ msg_Err (aout, "cannot set period: %s", snd_strerror (val)); ++ goto error; ++ } ++#endif + /* Set buffer size */ + param = AOUT_MAX_ADVANCE_TIME; + val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, ¶m, NULL); +@@ -503,14 +512,22 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) + msg_Err (aout, "cannot set buffer duration: %s", snd_strerror (val)); + goto error; + } +- +- param = AOUT_MIN_PREPARE_TIME; ++#if 0 ++ val = snd_pcm_hw_params_get_buffer_time (hw, ¶m, NULL); ++ if (val) ++ { ++ msg_Warn (aout, "cannot get buffer time: %s", snd_strerror(val)); ++ param = AOUT_MIN_PREPARE_TIME; ++ } ++ else ++ param /= 2; + val = snd_pcm_hw_params_set_period_time_near (pcm, hw, ¶m, NULL); + if (val) + { + msg_Err (aout, "cannot set period: %s", snd_strerror (val)); + goto error; + } ++#endif + + /* Commit hardware parameters */ + val = snd_pcm_hw_params (pcm, hw); \ No newline at end of file diff --git a/multimedia/video/vlc/files/vlc-2.2.4-cxx0x.patch b/multimedia/video/vlc/files/vlc-2.2.4-cxx0x.patch new file mode 100644 index 0000000000..cb3d63522d --- /dev/null +++ b/multimedia/video/vlc/files/vlc-2.2.4-cxx0x.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2016-09-21 07:10:58.885508665 +0200 ++++ b/configure.ac 2016-09-21 07:19:17.835725004 +0200 +@@ -3746,7 +3746,7 @@ + PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [ + PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [ + VLC_ADD_LIBS([qt4],[${QTX11_LIBS}]) +- VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11]) ++ VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11 -std=c++0x]) + PKG_CHECK_MODULES([XI], [xi], [ + VLC_ADD_LIBS([qt4], [${XI_LIBS}]) + VLC_ADD_CXXFLAGS([qt4], [${XI_CFLAGS} -DHAVE_XI]) diff --git a/multimedia/video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch b/multimedia/video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch new file mode 100644 index 0000000000..a164d253e8 --- /dev/null +++ b/multimedia/video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch @@ -0,0 +1,47 @@ +X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9 + +--- a/src/input/decoder.c ++++ b/src/input/decoder.c +@@ -1162,7 +1162,10 @@ + b_paused = p_owner->b_paused; + + if (!p_audio) ++ { ++ vlc_mutex_unlock( &p_owner->lock ); + break; ++ } + + /* */ + int i_rate = INPUT_RATE_DEFAULT; +@@ -1180,6 +1183,9 @@ + + if( unlikely(p_owner->b_paused != b_paused) ) + continue; /* race with input thread? retry... */ ++ ++ vlc_mutex_unlock( &p_owner->lock ); ++ + if( p_aout == NULL ) + b_reject = true; + +@@ -1199,7 +1205,6 @@ + + break; + } +- vlc_mutex_unlock( &p_owner->lock ); + } + + static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block ) +@@ -1961,11 +1966,10 @@ + + /* Parameters changed, restart the aout */ + vlc_mutex_lock( &p_owner->lock ); +- +- aout_DecDelete( p_owner->p_aout ); + p_owner->p_aout = NULL; +- + vlc_mutex_unlock( &p_owner->lock ); ++ aout_DecDelete( p_owner->p_aout ); ++ + input_resource_PutAout( p_owner->p_resource, p_aout ); + } + \ No newline at end of file diff --git a/multimedia/video/vlc/files/vlc-2.2.4-libav-11.7.patch b/multimedia/video/vlc/files/vlc-2.2.4-libav-11.7.patch new file mode 100644 index 0000000000..236a82b003 --- /dev/null +++ b/multimedia/video/vlc/files/vlc-2.2.4-libav-11.7.patch @@ -0,0 +1,9 @@ +--- a/modules/codec/avcodec/audio.c 2016-09-10 13:46:51.066453337 -0700 ++++ a/modules/codec/avcodec/audio.c 2016-09-10 13:42:26.061451090 -0700 +@@ -38,6 +38,7 @@ + + #include + #include ++#include + + #include "avcodec.h" \ No newline at end of file diff --git a/multimedia/video/vlc/files/vlc-2.2.4-qt57.patch b/multimedia/video/vlc/files/vlc-2.2.4-qt57.patch new file mode 100644 index 0000000000..97472a64c3 --- /dev/null +++ b/multimedia/video/vlc/files/vlc-2.2.4-qt57.patch @@ -0,0 +1,284 @@ +As the 2.2 headers are still using vlc_atomics (picture) +we cannot have a way to avoid collisions with early +or late inclusion when using GCC >= 4.7 + +Conditionals in vlc_atomic won't work. + +Happens in ProjectM and Qt5. +--- + modules/gui/qt4/actions_manager.cpp | 2 ++ + modules/gui/qt4/adapters/seekpoints.cpp | 4 +-- + modules/gui/qt4/adapters/seekpoints.hpp | 4 +-- + modules/gui/qt4/components/controller.cpp | 2 ++ + .../gui/qt4/components/playlist/playlist_model.hpp | 4 +-- + modules/gui/qt4/components/playlist/views.cpp | 6 ++++ + modules/gui/qt4/dialogs/messages.cpp | 2 ++ + modules/gui/qt4/dialogs/vlm.cpp | 4 --- + modules/gui/qt4/dialogs/vlm.hpp | 4 ++- + modules/gui/qt4/input_manager.cpp | 2 ++ + modules/gui/qt4/input_manager.hpp | 3 +- + modules/gui/qt4/menus.cpp | 2 ++ + modules/gui/qt4/qt4.hpp | 32 ++++++++++++++++++---- + modules/gui/qt4/util/pictureflow.cpp | 2 ++ + modules/visualization/projectm.cpp | 4 +++ + 15 files changed, 56 insertions(+), 21 deletions(-) + +diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp +index eff40d9..b7ca967 100644 +--- a/modules/gui/qt4/actions_manager.cpp ++++ b/modules/gui/qt4/actions_manager.cpp +@@ -25,6 +25,8 @@ + # include "config.h" + #endif + ++#include "qt4.hpp" ++ + #include + #include + +diff --git a/modules/gui/qt4/adapters/seekpoints.cpp b/modules/gui/qt4/adapters/seekpoints.cpp +index fbf2957..a3564bb 100644 +--- a/modules/gui/qt4/adapters/seekpoints.cpp ++++ b/modules/gui/qt4/adapters/seekpoints.cpp +@@ -19,14 +19,12 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + ++#include "seekpoints.hpp" + + #include "recents.hpp" + #include "dialogs_provider.hpp" + #include "menus.hpp" + +-#include "seekpoints.hpp" +- +-#include "qt4.hpp" + #include "input_manager.hpp" + + SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) : +diff --git a/modules/gui/qt4/adapters/seekpoints.hpp b/modules/gui/qt4/adapters/seekpoints.hpp +index 0083989..bbb9214 100644 +--- a/modules/gui/qt4/adapters/seekpoints.hpp ++++ b/modules/gui/qt4/adapters/seekpoints.hpp +@@ -22,9 +22,7 @@ + #ifndef SEEKPOINTS_HPP + #define SEEKPOINTS_HPP + +-#ifdef HAVE_CONFIG_H +-#include "config.h" +-#endif ++#include "qt4.hpp" + + #include + #include +diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp +index d93e0db..c43d929 100644 +--- a/modules/gui/qt4/components/controller.cpp ++++ b/modules/gui/qt4/components/controller.cpp +@@ -26,6 +26,8 @@ + # include "config.h" + #endif + ++#include "qt4.hpp" ++ + #include /* vout_thread_t for FSC */ + + /* Widgets */ +diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp +index f9d1d0c..1f71ac9 100644 +--- a/modules/gui/qt4/components/playlist/playlist_model.hpp ++++ b/modules/gui/qt4/components/playlist/playlist_model.hpp +@@ -25,9 +25,7 @@ + #ifndef _PLAYLIST_MODEL_H_ + #define _PLAYLIST_MODEL_H_ + +-#ifdef HAVE_CONFIG_H +-# include "config.h" +-#endif ++#include "qt4.hpp" + + #include + #include +diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp +index 59f6535..0066205 100644 +--- a/modules/gui/qt4/components/playlist/views.cpp ++++ b/modules/gui/qt4/components/playlist/views.cpp +@@ -21,6 +21,12 @@ + * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#include "qt4.hpp" ++ + #include "components/playlist/views.hpp" + #include "components/playlist/vlc_model.hpp" /* VLCModel */ + #include "components/playlist/sorting.h" /* Columns List */ +diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp +index 30793a2..9c79c99 100644 +--- a/modules/gui/qt4/dialogs/messages.cpp ++++ b/modules/gui/qt4/dialogs/messages.cpp +@@ -24,6 +24,8 @@ + # include "config.h" + #endif + ++#include "qt4.hpp" ++ + #include "dialogs/messages.hpp" + + #include +diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp +index 0da88cc..595f015 100644 +--- a/modules/gui/qt4/dialogs/vlm.cpp ++++ b/modules/gui/qt4/dialogs/vlm.cpp +@@ -23,10 +23,6 @@ + * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + +-#ifdef HAVE_CONFIG_H +-# include "config.h" +-#endif +- + #include "dialogs/vlm.hpp" + + #ifdef ENABLE_VLM +diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp +index a3c6e5d..dcf7110 100644 +--- a/modules/gui/qt4/dialogs/vlm.hpp ++++ b/modules/gui/qt4/dialogs/vlm.hpp +@@ -25,8 +25,10 @@ + #ifndef QVLC_VLM_DIALOG_H_ + #define QVLC_VLM_DIALOG_H_ 1 + ++#include "qt4.hpp" ++ + #ifdef HAVE_CONFIG_H +-# include "config.h" ++#include "config.h" + #endif + + #ifdef ENABLE_VLM +diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp +index fd45f4a..c50cb6c 100644 +--- a/modules/gui/qt4/input_manager.cpp ++++ b/modules/gui/qt4/input_manager.cpp +@@ -30,6 +30,8 @@ + # include "config.h" + #endif + ++#include "qt4.hpp" ++ + #include "input_manager.hpp" + #include "recents.hpp" + +diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp +index 7d3b76a..4fbecbb 100644 +--- a/modules/gui/qt4/input_manager.hpp ++++ b/modules/gui/qt4/input_manager.hpp +@@ -29,9 +29,10 @@ + # include "config.h" + #endif + ++#include "qt4.hpp" ++ + #include + +-#include "qt4.hpp" + #include "util/singleton.hpp" + #include "adapters/variables.hpp" + +diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp +index 116e98c..46240b0 100644 +--- a/modules/gui/qt4/menus.cpp ++++ b/modules/gui/qt4/menus.cpp +@@ -34,6 +34,8 @@ + # include "config.h" + #endif + ++#include "qt4.hpp" ++ + #include + #include + #include /* vout_thread_t */ +diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp +index 44d7db6..5aec957 100644 +--- a/modules/gui/qt4/qt4.hpp ++++ b/modules/gui/qt4/qt4.hpp +@@ -29,12 +29,7 @@ + # include "config.h" + #endif + +-#include /* VLC_COMMON_MEMBERS for vlc_interface.h */ +-#include /* intf_thread_t */ +-#include /* playlist_t */ +- +-#define QT_NO_CAST_TO_ASCII +-#include ++#include + + #if ( QT_VERSION < 0x040600 ) + # error Update your Qt version to at least 4.6.0 +@@ -43,6 +38,31 @@ + #define HAS_QT47 ( QT_VERSION >= 0x040700 ) + #define HAS_QT5 ( QT_VERSION >= 0x050000 ) + ++#if HAS_QT5 ++ #include ++ #if defined(Q_COMPILER_ATOMICS) && \ ++ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) ) ++ #define VLC_ATOMIC_H ++ #include ++ using namespace std; ++ # define atomic_store(object,desired) \ ++ do { \ ++ *(object) = (desired); \ ++ __sync_synchronize(); \ ++ } while (0) ++ ++ # define atomic_load(object) \ ++ (__sync_synchronize(), *(object)) ++ #endif ++#endif ++ ++#include /* VLC_COMMON_MEMBERS for vlc_interface.h */ ++#include /* intf_thread_t */ ++#include /* playlist_t */ ++ ++#define QT_NO_CAST_TO_ASCII ++#include ++ + enum { + DialogEventTypeOffset = 0, + IMEventTypeOffset = 100, +diff --git a/modules/gui/qt4/util/pictureflow.cpp b/modules/gui/qt4/util/pictureflow.cpp +index 9318953..a7e6a01 100644 +--- a/modules/gui/qt4/util/pictureflow.cpp ++++ b/modules/gui/qt4/util/pictureflow.cpp +@@ -29,6 +29,8 @@ + THE SOFTWARE. + */ + ++#include "qt4.hpp" ++ + #include "pictureflow.hpp" + + #include +diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp +index e80fbf4..96d532d 100644 +--- a/modules/visualization/projectm.cpp ++++ b/modules/visualization/projectm.cpp +@@ -30,6 +30,10 @@ + #endif + + #include ++#if defined(__GNUC__) && \ ++ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) ) ++ #define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */ ++#endif + + #include + #include +-- +2.7.4 diff --git a/multimedia/video/vlc/files/vlc-9999-libva-1.2.1-compat.patch b/multimedia/video/vlc/files/vlc-9999-libva-1.2.1-compat.patch new file mode 100644 index 0000000000..adfdefec56 --- /dev/null +++ b/multimedia/video/vlc/files/vlc-9999-libva-1.2.1-compat.patch @@ -0,0 +1,12 @@ +--- a/modules/codec/avcodec/vaapi.c ++++ b/modules/codec/avcodec/vaapi.c +@@ -34,6 +34,9 @@ + #ifdef VLC_VA_BACKEND_XLIB + # include + # include ++#if VA_MINOR_VERSION >= 34 ++# include ++#endif + #endif + #ifdef VLC_VA_BACKEND_DRM + # include diff --git a/multimedia/video/vlc/files/vlc-gcc6-buildfixes.patch b/multimedia/video/vlc/files/vlc-gcc6-buildfixes.patch new file mode 100644 index 0000000000..97a075c9a4 --- /dev/null +++ b/multimedia/video/vlc/files/vlc-gcc6-buildfixes.patch @@ -0,0 +1,388 @@ +From 66842e08e177e3c458fa0e4db970deae84feb625 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf +Date: Tue, 26 May 2015 13:39:00 +0200 +Subject: [PATCH 01/13] Fix C++11 compilation of atomic + +Close #14569 +--- + include/vlc_atomic.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 72 insertions(+) + +Index: vlc-2.2.3/include/vlc_atomic.h +=================================================================== +--- vlc-2.2.3.orig/include/vlc_atomic.h ++++ vlc-2.2.3/include/vlc_atomic.h +@@ -26,13 +26,20 @@ + * Atomic operations do not require locking, but they are not very powerful. + */ + +-# if !defined (__cplusplus) && (__STDC_VERSION__ >= 201112L) \ +- && !defined (__STDC_NO_ATOMICS__) ++/* Clang older versions support atomics but lacks the stdatomic.h header */ ++#if defined(__clang__) ++# if !defined(__has_include) || !__has_include() ++# define __STDC_NO_ATOMICS__ 1 ++# endif ++#endif + ++# ifndef __cplusplus ++# if (__STDC_VERSION__ >= 201112L) && !defined (__STDC_NO_ATOMICS__) + /*** Native C11 atomics ***/ +-# include ++# include + +-# else ++# else ++/*** Intel/GCC atomics ***/ + + # define ATOMIC_FLAG_INIT false + +@@ -53,22 +60,6 @@ + # define atomic_is_lock_free(obj) \ + false + +-/* In principles, __sync_*() only supports int, long and long long and their +- * unsigned equivalents, i.e. 4-bytes and 8-bytes types, although GCC also +- * supports 1 and 2-bytes types. Some non-x86 architectures do not support +- * 8-byte atomic types (or not efficiently). */ +-# if defined (_MSC_VER) +-/* Some atomic operations of the Interlocked API are only +- available for desktop apps. Thus we define the atomic types to +- be at least 32 bits wide. */ +-typedef int_least32_t atomic_flag; +-typedef int_least32_t atomic_bool; +-typedef int_least32_t atomic_char; +-typedef int_least32_t atomic_schar; +-typedef uint_least32_t atomic_uchar; +-typedef int_least32_t atomic_short; +-typedef uint_least32_t atomic_ushort; +-# else + typedef bool atomic_flag; + typedef bool atomic_bool; + typedef char atomic_char; +@@ -76,7 +67,6 @@ typedef signed char atomic_schar; + typedef unsigned char atomic_uchar; + typedef short atomic_short; + typedef unsigned short atomic_ushort; +-# endif + typedef int atomic_int; + typedef unsigned int atomic_uint; + typedef long atomic_long; +@@ -109,10 +99,6 @@ typedef ptrdiff_t atomic_ptrdiff + typedef intmax_t atomic_intmax_t; + typedef uintmax_t atomic_uintmax_t; + +-# if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || (defined (__clang__) && (defined (__x86_64__) || defined (__i386__))) +- +-/*** Intel/GCC atomics ***/ +- + # define atomic_store(object,desired) \ + do { \ + *(object) = (desired); \ +@@ -203,204 +189,7 @@ typedef uintmax_t atomic_uintmax + # define atomic_flag_clear_explicit(object,order) \ + atomic_flag_clear(object) + +-# elif defined (__GNUC__) +- +-/*** No atomics ***/ +- +-# define atomic_store(object,desired) \ +- do { \ +- typeof (object) _obj = (object); \ +- typeof (*object) _des = (desired); \ +- vlc_global_lock(VLC_ATOMIC_MUTEX); \ +- *_obj = _des; \ +- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ +- } while (0) +-# define atomic_store_explicit(object,desired,order) \ +- atomic_store(object,desired) +- +-# define atomic_load(object) \ +-({ \ +- typeof (object) _obj = (object); \ +- typeof (*object) _old; \ +- vlc_global_lock(VLC_ATOMIC_MUTEX); \ +- _old = *_obj; \ +- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ +- _old; \ +-}) +-# define atomic_load_explicit(object,order) \ +- atomic_load(object) +- +-# define atomic_exchange(object,desired) \ +-({ \ +- typeof (object) _obj = (object); \ +- typeof (*object) _des = (desired); \ +- typeof (*object) _old; \ +- vlc_global_lock(VLC_ATOMIC_MUTEX); \ +- _old = *_obj; \ +- *_obj = _des; \ +- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ +- _old; \ +-}) +-# define atomic_exchange_explicit(object,desired,order) \ +- atomic_exchange(object,desired) +- +-# define atomic_compare_exchange_strong(object,expected,desired) \ +-({ \ +- typeof (object) _obj = (object); \ +- typeof (object) _exp = (expected); \ +- typeof (*object) _des = (desired); \ +- bool ret; \ +- vlc_global_lock(VLC_ATOMIC_MUTEX); \ +- ret = *_obj == *_exp; \ +- if (ret) \ +- *_obj = _des; \ +- else \ +- *_exp = *_obj; \ +- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ +- ret; \ +-}) +-# define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \ +- atomic_compare_exchange_strong(object, expected, desired) +-# define atomic_compare_exchange_weak(object,expected,desired) \ +- atomic_compare_exchange_strong(object, expected, desired) +-# define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \ +- atomic_compare_exchange_weak(object, expected, desired) +- +-# define atomic_fetch_OP(object,desired,op) \ +-({ \ +- typeof (object) _obj = (object); \ +- typeof (*object) _des = (desired); \ +- typeof (*object) _old; \ +- vlc_global_lock(VLC_ATOMIC_MUTEX); \ +- _old = *_obj; \ +- *_obj = (*_obj) op (_des); \ +- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ +- _old; \ +-}) +- +-# define atomic_fetch_add(object,operand) \ +- atomic_fetch_OP(object,operand,+) +-# define atomic_fetch_add_explicit(object,operand,order) \ +- atomic_fetch_add(object,operand) +- +-# define atomic_fetch_sub(object,operand) \ +- atomic_fetch_OP(object,operand,-) +-# define atomic_fetch_sub_explicit(object,operand,order) \ +- atomic_fetch_sub(object,operand) +- +-# define atomic_fetch_or(object,operand) \ +- atomic_fetch_OP(object,operand,|) +-# define atomic_fetch_or_explicit(object,operand,order) \ +- atomic_fetch_or(object,operand) +- +-# define atomic_fetch_xor(object,operand) \ +- atomic_fetch_OP(object,operand,^) +-# define atomic_fetch_xor_explicit(object,operand,order) \ +- atomic_fetch_sub(object,operand) +- +-# define atomic_fetch_and(object,operand) \ +- atomic_fetch_OP(object,operand,&) +-# define atomic_fetch_and_explicit(object,operand,order) \ +- atomic_fetch_and(object,operand) +- +-# define atomic_flag_test_and_set(object) \ +- atomic_exchange(object, true) +- +-# define atomic_flag_test_and_set_explicit(object,order) \ +- atomic_flag_test_and_set(object) +- +-# define atomic_flag_clear(object) \ +- atomic_store(object, false) +- +-# define atomic_flag_clear_explicit(object,order) \ +- atomic_flag_clear(object) +- +-# elif defined (_MSC_VER) +- +-# include +- +-/*** Use the Interlocked API. ***/ +- +-/* Define macros in order to dispatch to the correct function depending on the type. +- Several ranges are need because some operations are not implemented for all types. */ +-# define atomic_type_dispatch_32_64(operation, object, ...) \ +- (sizeof(*object) == 4 ? operation((LONG *)object, __VA_ARGS__) : \ +- sizeof(*object) == 8 ? operation##64((LONGLONG *)object, __VA_ARGS__) : \ +- (abort(), 0)) +- +-# define atomic_type_dispatch_16_64(operation, object, ...) \ +- (sizeof(*object) == 2 ? operation##16((short *)object, __VA_ARGS__) : \ +- atomic_type_dispatch_32_64(operation, object, __VA_ARGS__)) +- +-# define atomic_type_dispatch_8_64(operation, object, ...) \ +- (sizeof(*object) == 1 ? operation##8((char *)object, __VA_ARGS__) : \ +- atomic_type_dispatch_16_64(operation, object, __VA_ARGS__)) +- +-# define atomic_store(object,desired) \ +- atomic_type_dispatch_16_64(InterlockedExchange, object, desired) +-# define atomic_store_explicit(object,desired,order) \ +- atomic_store(object, desired) +- +-# define atomic_load(object) \ +- atomic_type_dispatch_16_64(InterlockedCompareExchange, object, 0, 0) +-# define atomic_load_explicit(object,order) \ +- atomic_load(object) +- +-# define atomic_exchange(object,desired) \ +- atomic_type_dispatch_16_64(InterlockedExchange, object, desired) +-# define atomic_exchange_explicit(object,desired,order) \ +- atomic_exchange(object, desired) +- +-# define atomic_compare_exchange_strong(object,expected,desired) \ +- atomic_type_dispatch_16_64(InterlockedCompareExchange, object, *expected, desired) == *expected +-# define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \ +- atomic_compare_exchange_strong(object, expected, desired) +-# define atomic_compare_exchange_weak(object,expected,desired) \ +- atomic_compare_exchange_strong(object, expected, desired) +-# define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \ +- atomic_compare_exchange_weak(object, expected, desired) +- +-# define atomic_fetch_add(object,operand) \ +- atomic_type_dispatch_32_64(InterlockedExchangeAdd, object, operand) +-# define atomic_fetch_add_explicit(object,operand,order) \ +- atomic_fetch_add(object, operand) +- +-# define atomic_fetch_sub(object,operand) \ +- atomic_type_dispatch_32_64(InterlockedExchangeAdd, object, -(LONGLONG)operand) +-# define atomic_fetch_sub_explicit(object,operand,order) \ +- atomic_fetch_sub(object, operand) +- +-# define atomic_fetch_or(object,operand) \ +- atomic_type_dispatch_8_64(InterlockedOr, object, operand) +-# define atomic_fetch_or_explicit(object,operand,order) \ +- atomic_fetch_or(object, operand) +- +-# define atomic_fetch_xor(object,operand) \ +- atomic_type_dispatch_8_64(InterlockedXor, object, operand) +-# define atomic_fetch_xor_explicit(object,operand,order) \ +- atomic_fetch_sub(object, operand) +- +-# define atomic_fetch_and(object,operand) \ +- atomic_type_dispatch_8_64(InterlockedAnd, object, operand) +-# define atomic_fetch_and_explicit(object,operand,order) \ +- atomic_fetch_and(object, operand) +- +-# define atomic_flag_test_and_set(object) \ +- atomic_exchange(object, true) +- +-# define atomic_flag_test_and_set_explicit(object,order) \ +- atomic_flag_test_and_set(object) +- +-# define atomic_flag_clear(object) \ +- atomic_store(object, false) +- +-# define atomic_flag_clear_explicit(object,order) \ +- atomic_flag_clear(object) +- +-# else +-# error FIXME: implement atomic operations for this compiler. +-# endif +-# endif ++# endif /* !C11 */ + + typedef atomic_uint_least32_t vlc_atomic_float; + +@@ -427,4 +216,9 @@ static inline void vlc_atomic_store_floa + atomic_store(atom, u.i); + } + ++# else /* C++ */ ++/*** Native C++11 atomics ***/ ++# include ++# endif /* C++ */ ++ + #endif +Index: vlc-2.2.3/include/vlc_spu.h +=================================================================== +--- vlc-2.2.3.orig/include/vlc_spu.h ++++ vlc-2.2.3/include/vlc_spu.h +@@ -45,9 +45,6 @@ extern "C" { + + typedef struct spu_private_t spu_private_t; + +-/* Default subpicture channel ID */ +-#define SPU_DEFAULT_CHANNEL (1) +- + /** + * Subpicture unit descriptor + */ +Index: vlc-2.2.3/include/vlc_vout_osd.h +=================================================================== +--- vlc-2.2.3.orig/include/vlc_vout_osd.h ++++ vlc-2.2.3/include/vlc_vout_osd.h +@@ -26,12 +26,13 @@ + #ifndef VLC_VOUT_OSD_H + #define VLC_VOUT_OSD_H 1 + +-#include +- + #ifdef __cplusplus + extern "C" { + #endif + ++//* Default subpicture channel ID */ ++#define SPU_DEFAULT_CHANNEL (1) ++ + /** + * OSD menu position and picture type defines + */ +Index: vlc-2.2.3/src/video_output/video_output.c +=================================================================== +--- vlc-2.2.3.orig/src/video_output/video_output.c ++++ vlc-2.2.3/src/video_output/video_output.c +@@ -43,6 +43,7 @@ + #include + + #include ++#include + #include + #include + +Index: vlc-2.2.3/modules/gui/qt4/dialogs/messages.hpp +=================================================================== +--- vlc-2.2.3.orig/modules/gui/qt4/dialogs/messages.hpp ++++ vlc-2.2.3/modules/gui/qt4/dialogs/messages.hpp +@@ -28,8 +28,8 @@ + #include "util/singleton.hpp" + #include "ui/messages_panel.h" + #include +-#include + #include ++#include + + class QTabWidget; + class QPushButton; +@@ -55,7 +55,7 @@ private: + void sinkMessage( const MsgEvent * ); + bool matchFilter( const QString& ); + +- atomic_uint verbosity; ++ QAtomicInt verbosity; + static void MsgCallback( void *, int, const vlc_log_t *, const char *, + va_list ); + +Index: vlc-2.2.3/modules/gui/qt4/dialogs/messages.cpp +=================================================================== +--- vlc-2.2.3.orig/modules/gui/qt4/dialogs/messages.cpp ++++ vlc-2.2.3/modules/gui/qt4/dialogs/messages.cpp +@@ -143,7 +143,7 @@ MessagesDialog::~MessagesDialog() + + void MessagesDialog::changeVerbosity( int i_verbosity ) + { +- atomic_store( &this->verbosity, i_verbosity ); ++ verbosity = i_verbosity; + } + + void MessagesDialog::updateConfig() +@@ -337,7 +337,7 @@ void MessagesDialog::MsgCallback( void * + { + MessagesDialog *dialog = (MessagesDialog *)self; + char *str; +- int verbosity = atomic_load( &dialog->verbosity ); ++ int verbosity = dialog->verbosity; + + if( verbosity < 0 || verbosity < (type - VLC_MSG_ERR) + || unlikely(vasprintf( &str, format, ap ) == -1) ) diff --git a/multimedia/video/vlc/pspec.xml b/multimedia/video/vlc/pspec.xml index de83d81446..b2615f107c 100644 --- a/multimedia/video/vlc/pspec.xml +++ b/multimedia/video/vlc/pspec.xml @@ -123,6 +123,14 @@ ffmpeg3.patch lua53_compat.patch qt4-select.patch + + vlc-9999-libva-1.2.1-compat.patch + vlc-2.2.4-libav-11.7.patch + vlc-2.2.4-decoder-lock-scope.patch + vlc-2.2.2-qt5widgets.patch + vlc-2.2.4-alsa-large-buffers.patch + vlc-2.2.4-cxx0x.patch + vlc-2.2.4-qt57.patch vlc-2.1.1-desktop.patch @@ -291,7 +299,7 @@ 2017-03-05 2.2.4 - Rebuild. + Rebuild Ertuğrul Erata ertugrulerata@gmail.com From 926bbed6bab40ea2fc7e2a712f43eeea313cb2b3 Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Sun, 5 Mar 2017 22:16:44 +0300 Subject: [PATCH 06/11] opps --- .../language/python/python-qt5/pspec.xml | 81 +++++++++++-------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml index e967062199..e95458e47c 100644 --- a/programming/language/python/python-qt5/pspec.xml +++ b/programming/language/python/python-qt5/pspec.xml @@ -13,29 +13,32 @@ library A set of Python bindings for the Qt 5.x Toolkit Qt is a set of C++ libraries and development tools that includes platform independent abstractions for graphical user interfaces, networking, threads, Unicode, regular expressions, SQL databases, SVG, OpenGL, XML, and user and application settings. PyQt implements 440 of these classes as a set of Python modules. - mirrors://sourceforge/pyqt/PyQt5/PyQt-5.6/PyQt5_gpl-5.6.tar.gz + mirrors://sourceforge/pyqt/PyQt5/PyQt-5.7.1/PyQt5_gpl-5.7.1.tar.gz dbus-devel + dbus-python dbus-python-common python-devel - python-sip - qt5-base-devel - qt5-connectivity-devel - qt5-declarative-devel - qt5-enginio-devel - qt5-location-devel - qt5-multimedia-devel - qt5-sensors-devel - qt5-serialport-devel - qt5-svg-devel - qt5-webchannel-devel - qt5-webkit-devel - qt5-websockets-devel - qt5-x11extras-devel - qt5-xmlpatterns-devel + python-sip + qt5-base-devel + qt5-connectivity-devel + qt5-declarative-devel + qt5-location-devel + qt5-multimedia-devel + qt5-sensors-devel + qt5-serialport-devel + qt5-svg-devel + qt5-webchannel-devel + qt5-webkit-devel + qt5-websockets-devel + qt5-x11extras-devel + qt5-xmlpatterns-devel + qt5-quickcontrols2-devel + qt5-script-devel + qt5-designer-devel - PyQt5_gpl-5.6-dbus_ftbfs.patch + @@ -46,38 +49,39 @@ libgcc dbus python - qt5-base - qt5-sensors - qt5-location - qt5-webkit - qt5-enginio - qt5-x11extras - qt5-svg - qt5-multimedia - qt5-serialport - qt5-webchannel - qt5-websockets - qt5-declarative - qt5-xmlpatterns - qt5-connectivity + qt5-base + qt5-sensors + qt5-location + qt5-webkit + qt5-x11extras + qt5-svg + qt5-multimedia + qt5-serialport + qt5-webchannel + qt5-websockets + qt5-declarative + qt5-xmlpatterns + qt5-connectivity + qt5-designer python-sip /usr/bin/py2uic5 /usr/lib/python2.7/site-packages /usr/lib/qt5/plugins/PyQt5/libpy2qt5qmlplugin.so - /usr/share/qt5/qsci/api/python/Py2Qt5.api + /usr/lib/qt5/plugins/designer/libpyqt5.so + /usr/share/qt5/qsci/api/python/Py2Qt5.api /usr/bin/py2rcc5 - /usr/bin/py2lupdate5 + /usr/bin/py2lupdate5 python-qt5-devel - Development files for python3-qt5 + Development files for python-qt5 libgcc - qt5-base + qt5-base python-qt5 @@ -86,6 +90,13 @@ + + 2017-03-05 + 5.7.1 + Version Bump + Kamil Atlı + suvari@pisilinux.org + 2016-06-09 5.6 From a48e55a8ebe06785b95ed8a8c424ec2c03e88c82 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 6 Mar 2017 11:53:20 +0300 Subject: [PATCH 07/11] libreoffice:v.bump to 5.3.1.1 --- office/libreoffice/libreoffice/actions.py | 61 +++++++-- .../libreoffice/files/disable_libe-book.patch | 118 ++++++++++++++++++ office/libreoffice/libreoffice/pspec.xml | 85 +++++++++++-- 3 files changed, 241 insertions(+), 23 deletions(-) create mode 100644 office/libreoffice/libreoffice/files/disable_libe-book.patch diff --git a/office/libreoffice/libreoffice/actions.py b/office/libreoffice/libreoffice/actions.py index e4b00fff27..23e26a51e8 100644 --- a/office/libreoffice/libreoffice/actions.py +++ b/office/libreoffice/libreoffice/actions.py @@ -21,7 +21,7 @@ if get.buildTYPE() == "i686": shelltools.system('sed -i -e /CppunitTest_sd_import_tests/d sd/Module_sd.mk') def setup(): - shelltools.system('sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac') + #shelltools.system('sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac') shelltools.chmod("%s/bin/unpack-sources" % OurWorkDir) shelltools.export("LO_PREFIX", "/usr") shelltools.export("PYTHON", "python3.6") @@ -29,49 +29,84 @@ def setup(): shelltools.touch("autogen.lastrun") shelltools.system('sed -e "/distro-install-file-lists/d" -i Makefile.in') - #shelltools.system('sed -e "/ustrbuf/a #include " \ - ###-i svl/source/misc/gridprinter.cxx') - shelltools.system('./autogen.sh \ - --prefix=/usr \ + shelltools.system('./autogen.sh \ + --prefix=/usr \ --sysconfdir=/etc \ --with-vendor="Pisi Linux" \ - --with-lang="ALL" \ - --enable-gtk3 \ - --with-help \ - --with-myspell-dicts \ - --with-alloc=system \ + --with-lang="ALL" \ + --enable-gtk3 \ + --with-help \ + --with-myspell-dicts \ + --with-alloc=system \ --with-java \ --without-system-dicts \ + --without-fonts \ --disable-postgresql-sdbc \ + --disable-firebird-sdbc \ + --disable-coinmp \ + --disable-systray \ + --without-system-hsqldb \ --enable-release-build=yes \ --enable-python=system \ + --with-system-apr \ --with-system-boost \ - --with-system-curl \ --with-system-cairo \ + --with-system-clucene \ + --with-system-cppunit \ + --with-system-curl \ --with-system-expat \ + --with-system-graphite \ + --with-system-glew \ + --with-system-glm \ --with-system-harfbuzz \ + --with-system-hunspell \ --with-system-icu \ --with-system-jpeg \ --with-system-lcms2 \ + --with-system-libcdr \ + --without-system-libcmis \ + --with-system-libetonyek \ + --with-system-libmspub \ + --with-system-libodfgen \ + --with-system-libpagemaker \ --with-system-libpng \ + --with-system-librevenge \ + --with-system-libvisio \ + --with-system-libwpd \ + --with-system-libwpg \ + --with-system-libwps \ --with-system-libxml \ + --with-system-mdds \ + --with-system-liblangtag \ + --without-system-libstaroffice \ + --without-system-libzmf \ + --with-system-neon \ --with-system-nss \ + --with-system-odbc \ + --with-system-openldap \ --with-system-openssl \ + --without-system-orcus \ --with-system-poppler \ + --with-system-postgresql \ + --with-system-redland \ + --with-system-serf \ + --without-system-ucpp \ --with-system-zlib \ + --with-system-libetonyek \ --enable-scripting-beanshell \ --enable-scripting-javascript \ --disable-odk \ --enable-ext-wiki-publisher \ --enable-ext-nlpsolver \ - --disable-firebird-sdbc \ --with-jdk-home=/usr/lib/jvm/java-7-openjdk \ + --with-external-tar=external/tarballs \ --with-gdrive-client-id=413772536636.apps.googleusercontent.com \ --with-gdrive-client-secret=0ZChLK6AxeA3Isu96MkwqDR4 \ --with-parallelism=%s' % (get.makeJOBS().replace("-j",""))) + def build(): - autotools.make("build-nocheck") + autotools.make("verbose=true build-nocheck") def install(): autotools.rawInstall("DESTDIR=%s distro-pack-install" % get.installDIR()) diff --git a/office/libreoffice/libreoffice/files/disable_libe-book.patch b/office/libreoffice/libreoffice/files/disable_libe-book.patch new file mode 100644 index 0000000000..3e043d4820 --- /dev/null +++ b/office/libreoffice/libreoffice/files/disable_libe-book.patch @@ -0,0 +1,118 @@ +diff -Nuar libreoffice-5.3.0.3/configure.ac libreoffice/configure.ac +--- libreoffice-5.3.0.3/configure.ac 2017-01-27 01:22:46.000000000 +0300 ++++ libreoffice/configure.ac 2017-03-03 11:25:53.765271189 +0300 +@@ -7875,9 +7875,6 @@ + + libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) + +-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1]) +-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2]) +- + libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1]) + + libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0]) +diff -Nuar libreoffice-5.3.0.3/external/Module_external.mk libreoffice/external/Module_external.mk +--- libreoffice-5.3.0.3/external/Module_external.mk 2017-01-27 01:22:46.000000000 +0300 ++++ libreoffice/external/Module_external.mk 2017-03-03 11:26:43.746274226 +0300 +@@ -36,7 +36,6 @@ + $(call gb_Helper_optional,CPPUNIT,cppunit) \ + $(call gb_Helper_optional,CT2N,ct2n) \ + $(call gb_Helper_optional,CURL,curl) \ +- $(call gb_Helper_optional,EBOOK,libebook) \ + $(call gb_Helper_optional,EPM,epm) \ + $(call gb_Helper_optional,ETONYEK,libetonyek) \ + $(call gb_Helper_optional,EXPAT,expat) \ +diff -Nuar libreoffice-5.3.0.3/filter/Configuration_filter.mk libreoffice/filter/Configuration_filter.mk +--- libreoffice-5.3.0.3/filter/Configuration_filter.mk 2017-01-27 01:22:46.000000000 +0300 ++++ libreoffice/filter/Configuration_filter.mk 2017-03-03 11:28:16.996279891 +0300 +@@ -345,10 +345,6 @@ + writer_OOXML \ + writer_OOXML_Template \ + writer_layout_dump_xml \ +- writer_BroadBand_eBook \ +- writer_FictionBook_2 \ +- writer_PalmDoc \ +- writer_Plucker_eBook \ + writer_ApplePages \ + MWAW_Text_Document \ + Palm_Text_Document \ +@@ -391,10 +387,6 @@ + OOXML_Text \ + OOXML_Text_Template \ + writer_layout_dump \ +- BroadBand_eBook \ +- FictionBook_2 \ +- PalmDoc \ +- Plucker_eBook \ + ApplePages \ + MWAW_Text_Document \ + Palm_Text_Document \ +diff -Nuar libreoffice-5.3.0.3/writerperfect/Library_wpftwriter.mk libreoffice/writerperfect/Library_wpftwriter.mk +--- libreoffice-5.3.0.3/writerperfect/Library_wpftwriter.mk 2017-01-27 01:22:46.000000000 +0300 ++++ libreoffice/writerperfect/Library_wpftwriter.mk 2017-03-03 11:30:32.317288112 +0300 +@@ -49,7 +49,6 @@ + $(eval $(call gb_Library_use_externals,wpftwriter,\ + abw \ + boost_headers \ +- ebook \ + etonyek \ + icu_headers \ + icui18n \ +@@ -67,7 +66,6 @@ + + $(eval $(call gb_Library_add_exception_objects,wpftwriter,\ + writerperfect/source/writer/AbiWordImportFilter \ +- writerperfect/source/writer/EBookImportFilter \ + writerperfect/source/writer/MSWorksImportFilter \ + writerperfect/source/writer/MWAWImportFilter \ + writerperfect/source/writer/PagesImportFilter \ +diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftImportTestBase.hxx libreoffice/writerperfect/qa/unit/WpftImportTestBase.hxx +--- libreoffice-5.3.0.3/writerperfect/qa/unit/WpftImportTestBase.hxx 2017-01-27 01:22:46.000000000 +0300 ++++ libreoffice/writerperfect/qa/unit/WpftImportTestBase.hxx 2017-03-03 11:31:44.484292497 +0300 +@@ -29,9 +29,6 @@ + ((minor) > (req_minor) \ + || ((minor) == (req_minor) && ((micro) >= (req_micro))))) + +-#define REQUIRE_EBOOK_VERSION(major, minor, micro) \ +- REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, micro) +- + #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ + REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro) + +diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftWriterFilterTest.cxx libreoffice/writerperfect/qa/unit/WpftWriterFilterTest.cxx +--- libreoffice-5.3.0.3/writerperfect/qa/unit/WpftWriterFilterTest.cxx 2017-01-27 01:22:46.000000000 +0300 ++++ libreoffice/writerperfect/qa/unit/WpftWriterFilterTest.cxx 2017-03-03 11:33:22.738298466 +0300 +@@ -31,10 +31,6 @@ + + void WpftWriterFilterTest::test() + { +- const writerperfect::test::WpftOptionalMap_t aEBookOptional +- { +- {"FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1)}, +- }; + const writerperfect::test::WpftOptionalMap_t aEtonyekOptional + { + {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)}, +@@ -58,7 +54,6 @@ + }; + + doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/"); +- doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional); + doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional); + doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional); + doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional); +diff -Nuar libreoffice-5.3.0.3/writerperfect/source/writer/wpftwriter.component libreoffice/writerperfect/source/writer/wpftwriter.component +--- libreoffice-5.3.0.3/writerperfect/source/writer/wpftwriter.component 2017-01-27 01:22:46.000000000 +0300 ++++ libreoffice/writerperfect/source/writer/wpftwriter.component 2017-03-03 11:34:21.210302018 +0300 +@@ -38,11 +38,6 @@ + + + +- +- +- +- + + diff --git a/office/libreoffice/libreoffice/pspec.xml b/office/libreoffice/libreoffice/pspec.xml index 2670559dd9..26cdaaead1 100644 --- a/office/libreoffice/libreoffice/pspec.xml +++ b/office/libreoffice/libreoffice/pspec.xml @@ -13,19 +13,58 @@ app:gui LibreOffice office suite LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office. - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-5.3.0.3.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-help-5.3.0.3.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-dictionaries-5.3.0.3.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-translations-5.3.0.3.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-5.3.1.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-help-5.3.1.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-dictionaries-5.3.1.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-translations-5.3.1.1.tar.xz + + + http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz + http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz + http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + http://dev-www.libreoffice.org/src/language-subtag-registry-2015-08-04.tar.bz2 + http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 + http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2 + http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2 + http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2 + http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz + http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip + http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz + http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2 + http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz + http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 + http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2 + http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2 + http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2 + http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz + http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz + http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar + http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar + You_make_ME_sandwich.patch 0001-right-click-to-insert-image.patch - 0001-gtk3-implement-opengl-support-for-slideshow.patch 0001-installation-fix.patch 0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch 0001-Related-rhbz-1422353-make-writer-behave-like-calc-an.patch + disable_libe-book.patch ant @@ -35,7 +74,7 @@ curl-devel glew-devel libXt-devel - lcms2-devel + lcms2-devel boost-devel libSM-devel jdk7-openjdk @@ -61,12 +100,38 @@ gtk2-devel libatomic_ops-devel librsvg-devel - unixODBC-devel - serf-devel + unixODBC-devel + serf-devel gobject-introspection-devel graphite2-devel librevenge-devel mesa-devel + neon-devel + clucene-devel + apr-devel + mesa-glu-devel + icu4c-devel + gnutls-devel + postgresql-lib + libetonyek-devel + libvisio-devel + doxygen + liblangtag-devel + mdds-devel + glew-devel + glm + cppunit-devel + hunspell-devel + libcdr-devel + libmspub-devel + libodfgen-devel + libpagemaker-devel + libwpd-devel + libwpg-devel + libwps-devel + raptor2-devel + rasqal-devel + redland-devel @@ -3122,8 +3187,8 @@ - 2017-02-22 - 5.3.0.3 + 2017-03-05 + 5.3.1.1 Release Bump Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org From f703747a4fbadbce86b9710b4d2f74e0407decbe Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 6 Mar 2017 12:24:36 +0300 Subject: [PATCH 08/11] libreoffice:fixed url --- office/libreoffice/libreoffice/pspec.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/office/libreoffice/libreoffice/pspec.xml b/office/libreoffice/libreoffice/pspec.xml index 26cdaaead1..c51b049a81 100644 --- a/office/libreoffice/libreoffice/pspec.xml +++ b/office/libreoffice/libreoffice/pspec.xml @@ -13,10 +13,10 @@ app:gui LibreOffice office suite LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office. - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-5.3.1.1.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-help-5.3.1.1.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-dictionaries-5.3.1.1.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-translations-5.3.1.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.1/libreoffice-5.3.1.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.1/libreoffice-help-5.3.1.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.1/libreoffice-dictionaries-5.3.1.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.1/libreoffice-translations-5.3.1.1.tar.xz http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz From c0590072c22f6b97f9a82b2706422ffa8c180214 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 6 Mar 2017 12:25:57 +0300 Subject: [PATCH 09/11] openslp:rebuild --- network/analyzer/openslp/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/network/analyzer/openslp/pspec.xml b/network/analyzer/openslp/pspec.xml index 9174dbccf2..679ddb3f97 100644 --- a/network/analyzer/openslp/pspec.xml +++ b/network/analyzer/openslp/pspec.xml @@ -68,6 +68,13 @@ + + 2017-03-06 + 2.0.0 + Release Bump + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2016-06-09 2.0.0 From 69be79be9726ff8b84ad54e754142cb958764569 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 6 Mar 2017 14:11:32 +0300 Subject: [PATCH 10/11] libreoffice:rebuild --- office/libreoffice/libreoffice/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/office/libreoffice/libreoffice/pspec.xml b/office/libreoffice/libreoffice/pspec.xml index c51b049a81..1dd40c86d0 100644 --- a/office/libreoffice/libreoffice/pspec.xml +++ b/office/libreoffice/libreoffice/pspec.xml @@ -3189,7 +3189,7 @@ 2017-03-05 5.3.1.1 - Release Bump + Release Bump. Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org From c7c64972a2744dd8cbfde57453a876fd13f98569 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 6 Mar 2017 21:50:50 +0300 Subject: [PATCH 11/11] libreoffice:rebuild --- office/libreoffice/libreoffice/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/office/libreoffice/libreoffice/pspec.xml b/office/libreoffice/libreoffice/pspec.xml index 1dd40c86d0..c51b049a81 100644 --- a/office/libreoffice/libreoffice/pspec.xml +++ b/office/libreoffice/libreoffice/pspec.xml @@ -3189,7 +3189,7 @@ 2017-03-05 5.3.1.1 - Release Bump. + Release Bump Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org