Merge branch 'master' of github.com:pisilinux/main into 4yali

This commit is contained in:
Ertuğrul Erata
2017-03-07 18:39:03 +03:00
17 changed files with 1133 additions and 63 deletions
+7
View File
@@ -63,6 +63,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-03-05</Date>
<Version>1.4.9</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2017-02-05</Date>
<Version>1.4.9</Version>
+1
View File
@@ -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 \
@@ -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"])
@@ -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, &param, 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, &param, 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, &param, 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, &param, 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);
@@ -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])
@@ -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 );
}
@@ -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 <libavcodec/avcodec.h>
#include <libavutil/mem.h>
+#include <libavutil/channel_layout.h>
#include "avcodec.h"
@@ -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 <atomic> 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 <vlc_vout.h>
#include <vlc_keys.h>
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 <vlc_common.h>
#include <vlc_interface.h>
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 <vlc_vout.h> /* 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 <vlc_input.h>
#include <vlc_playlist.h>
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 <QPlainTextEdit>
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 <vlc_input.h>
-#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 <vlc_common.h>
#include <vlc_intf_strings.h>
#include <vlc_vout.h> /* 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.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */
-#include <vlc_interface.h> /* intf_thread_t */
-#include <vlc_playlist.h> /* playlist_t */
-
-#define QT_NO_CAST_TO_ASCII
-#include <QString>
+#include <QtGlobal>
#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 <QtCore/qcompilerdetection.h>
+ #if defined(Q_COMPILER_ATOMICS) && \
+ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
+ #define VLC_ATOMIC_H
+ #include <atomic>
+ 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.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */
+#include <vlc_interface.h> /* intf_thread_t */
+#include <vlc_playlist.h> /* playlist_t */
+
+#define QT_NO_CAST_TO_ASCII
+#include <QString>
+
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 <QApplication>
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 <assert.h>
+#if defined(__GNUC__) && \
+ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
+ #define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */
+#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
--
2.7.4
@@ -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 <vlc_xlib.h>
# include <va/va_x11.h>
+#if VA_MINOR_VERSION >= 34
+# include <va/va_compat.h>
+#endif
#endif
#ifdef VLC_VA_BACKEND_DRM
# include <sys/types.h>
@@ -0,0 +1,388 @@
From 66842e08e177e3c458fa0e4db970deae84feb625 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
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(<stdatomic.h>)
+# define __STDC_NO_ATOMICS__ 1
+# endif
+#endif
+# ifndef __cplusplus
+# if (__STDC_VERSION__ >= 201112L) && !defined (__STDC_NO_ATOMICS__)
/*** Native C11 atomics ***/
-# include <stdatomic.h>
+# include <stdatomic.h>
-# 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 <windows.h>
-
-/*** 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 <atomic>
+# 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 <vlc_spu.h>
-
#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 <vlc_vout.h>
#include <vlc_filter.h>
+#include <vlc_spu.h>
#include <vlc_vout_osd.h>
#include <vlc_image.h>
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 <stdarg.h>
-#include <vlc_atomic.h>
#include <QMutex>
+#include <QAtomicInt>
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) )
+9 -1
View File
@@ -123,6 +123,14 @@
<Patch level="1">ffmpeg3.patch</Patch>
<Patch level="1">lua53_compat.patch</Patch>
<Patch>qt4-select.patch</Patch>
<!-- <Patch level="1">vlc-gcc6-buildfixes.patch</Patch> -->
<Patch level="1">vlc-9999-libva-1.2.1-compat.patch</Patch>
<Patch level="1">vlc-2.2.4-libav-11.7.patch</Patch>
<Patch level="1">vlc-2.2.4-decoder-lock-scope.patch</Patch>
<Patch level="1">vlc-2.2.2-qt5widgets.patch</Patch>
<Patch level="1">vlc-2.2.4-alsa-large-buffers.patch</Patch>
<Patch level="1">vlc-2.2.4-cxx0x.patch</Patch>
<Patch level="1">vlc-2.2.4-qt57.patch</Patch>
<!-- <Patch>lc-2.2.0-fix-xcb.patch</Patch> -->
<!-- <Patch>vlc-2.2.0-rdp-1.2.0.patch</Patch> -->
<Patch level="0">vlc-2.1.1-desktop.patch</Patch>
@@ -291,7 +299,7 @@
<Update release="4">
<Date>2017-03-05</Date>
<Version>2.2.4</Version>
<Comment>Rebuild.</Comment>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
+10 -3
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Core libraries for Xine movie player</Summary>
<Description>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.</Description>
<Archive sha1sum="ac929eef2b7bf5c27699bbed612b953a01fccba5" type="tarxz">http://sourceforge.net/projects/xine/files/xine-lib/1.2.6/xine-lib-1.2.6.tar.xz</Archive>
<Archive sha1sum="f20115ddfced42d51feb159393607b17e6f2bdc1" type="tarxz">http://sourceforge.net/projects/xine/files/xine-lib/1.2.8/xine-lib-1.2.8.tar.xz</Archive>
<AdditionalFiles>
<AdditionalFile permission="0644" target="src/xine-engine/accel_vaapi.h">accel_vaapi.h</AdditionalFile>
</AdditionalFiles>
@@ -57,9 +57,9 @@
<Dependency>libvdpau-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">xine-lib-ffmpeg3.patch</Patch>
<!-- <Patch level="1">xine-lib-ffmpeg3.patch</Patch> -->
<Patch level="1">list.patch</Patch>
<Patch level="1">multilib.patch</Patch>
<!-- <Patch level="1">multilib.patch</Patch> -->
<Patch level="1">no_autopoint.patch</Patch>
<Patch level="1">dmo.patch</Patch>
<Patch level="1">tr_segfault_fix.patch</Patch>
@@ -136,6 +136,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-03-05</Date>
<Version>1.2.8</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-14</Date>
<Version>1.2.6</Version>
+7
View File
@@ -68,6 +68,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-03-06</Date>
<Version>2.0.0</Version>
<Comment>Release Bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>2.0.0</Version>
+48 -13
View File
@@ -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 <algorithm>" \
###-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())
@@ -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 @@
<service name="com.sun.star.document.ExtendedTypeDetection"/>
<service name="com.sun.star.document.ImportFilter"/>
</implementation>
- <implementation name="org.libreoffice.comp.Writer.EBookImportFilter"
- constructor="org_libreoffice_comp_Writer_EBookImportFilter_get_implementation">
- <service name="com.sun.star.document.ExtendedTypeDetection"/>
- <service name="com.sun.star.document.ImportFilter"/>
- </implementation>
<implementation name="org.libreoffice.comp.Writer.PagesImportFilter"
constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation">
<service name="com.sun.star.document.ExtendedTypeDetection"/>
+75 -10
View File
@@ -13,19 +13,58 @@
<IsA>app:gui</IsA>
<Summary>LibreOffice office suite</Summary>
<Description>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.</Description>
<Archive sha1sum="d3bfb63477a9fee6d98b31264d5cbce2d20450c4" type="tarxz">http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-5.3.0.3.tar.xz</Archive>
<Archive sha1sum="fb5019676834ccc1a5dea93b7b04895c159de06d" type="binary" target="libreoffice-5.3.0.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-help-5.3.0.3.tar.xz</Archive>
<Archive sha1sum="dea91493d6abe60e302f89150b3c184daf9e26f0" type="binary" target="libreoffice-5.3.0.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-dictionaries-5.3.0.3.tar.xz</Archive>
<Archive sha1sum="1eaa20f207ec236e4d6ba83bae170b45f150ee1e" type="binary" target="libreoffice-5.3.0.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-translations-5.3.0.3.tar.xz</Archive>
<Archive sha1sum="1fd169a71efad4e99c65d5c7a9b9f2484aa6b22d" type="tarxz">http://download.documentfoundation.org/libreoffice/src/5.3.1/libreoffice-5.3.1.1.tar.xz</Archive>
<Archive sha1sum="1ea9d4f9d751fd0d206378d105c6367dc07bf353" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.1/libreoffice-help-5.3.1.1.tar.xz</Archive>
<Archive sha1sum="f0b65dc453680fe0373314ceffab689ffe3828a1" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.1/libreoffice-dictionaries-5.3.1.1.tar.xz</Archive>
<Archive sha1sum="614a45f7654575dfa2af0945d50828275bd92b70" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.1/libreoffice-translations-5.3.1.1.tar.xz</Archive>
<!--External build dependencies-->
<Archive sha1sum="a0cc67aa534167bb59bcca0dc6a7db2573814542" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz</Archive>
<Archive sha1sum="1acea86fd399ed7817879d36370d3d1f8b109050" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip</Archive>
<Archive sha1sum="8a90669029e107b61953b90ba11545fef586c2ca" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip</Archive>
<Archive sha1sum="2d49e11b0b711970f494294dc3698f05eb294853" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip</Archive>
<Archive sha1sum="0a134d01e9aeb09b33f4c7450fb41abb7bed9db6" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz</Archive>
<Archive sha1sum="43a7ff11dd15370d456b20a093e1ee81279163a0" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip</Archive>
<Archive sha1sum="b92930010622906778f713fb8f0153fa0683d018" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip</Archive>
<Archive sha1sum="3232dd31859be4f7eb443c33e8e3287f394789a0" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip</Archive>
<Archive sha1sum="47b58e0ef2d856df26372a7061ae43fae6e08051" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip</Archive>
<Archive sha1sum="5ecb895ffc1eff2c381fa78d2197d0c57422b3df" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip</Archive>
<Archive sha1sum="a637c0c3ad3be32d6814972e1c45e547c5f6359d" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip</Archive>
<Archive sha1sum="e393beea80d36ff27b732882c706826988a64f5c" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip</Archive>
<Archive sha1sum="b19ad429273abb116432eae3af955ecaf1ab5b17" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip</Archive>
<Archive sha1sum="65dfba9970bb862d09c1f9e636b86b22f05d3936" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip</Archive>
<Archive sha1sum="452eba922e4f41603539c9dc39947d2271e47093" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz</Archive>
<Archive sha1sum="dd11138668c87862b494819621ec313aaa675d36" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/language-subtag-registry-2015-08-04.tar.bz2</Archive>
<Archive sha1sum="1169780b4a0c515b23b96c913fd9bc52ceb7fb39" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2</Archive>
<Archive sha1sum="c4f5760a1d21213dc52e2cf3ad9c0b9112585f36" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2</Archive>
<Archive sha1sum="7168b0f40aa5c72267899601c116d2348d2f56ec" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip</Archive>
<Archive sha1sum="49860235c52b0be395b216d3f33955f935036f8e" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2</Archive>
<Archive sha1sum="3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip</Archive>
<Archive sha1sum="1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip</Archive>
<Archive sha1sum="713ffc76f065390ce82016ba205415d5bffe724f" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2</Archive>
<Archive sha1sum="0c6c11c04481cb4bfd169b4b3f58434580a96f6a" type="binary" target="libreoffice-5.3.1.1/external/tarballs">http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz</Archive>
<Archive sha1sum="76497846de1f3d2ef438d79e31328107658d10be" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip</Archive>
<Archive sha1sum="0556c392beb59433e577e3517575801212201df6" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz</Archive>
<Archive sha1sum="d4bc4d7d67ccc815a4f9c6fa54077f5fdb82a57f" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2</Archive>
<Archive sha1sum="94c00715ae8a31bc8e5a6a699e36c22d0020649e" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz</Archive>
<Archive sha1sum="1e30dcdb066dfc5814029ab34dca80f38935dc2d" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2</Archive>
<Archive sha1sum="9ba2db0c34dfb9b20f42121628b787c130502890" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2</Archive>
<Archive sha1sum="fb7ec416807e49cb8cb12b1e46003499fad9df5f" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2</Archive>
<Archive sha1sum="88d8ff7220d8ec71ab3125bd69fc6d0afe225bec" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2</Archive>
<Archive sha1sum="815216ecc4c8cac1cc5905ca3fb5d6168c1deac4" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz</Archive>
<Archive sha1sum="c038831d84882cdf639e038e44decb1e40527591" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz</Archive>
<Archive sha1sum="a0459f60e9b68c561aac05bbd3556b7e31690e44" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar</Archive>
<Archive sha1sum="f4772556920231cf164348e51285b0c18dfc7f5b" type="binary" target="libreoffice-5.3.1.1/external/tarballs/">http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar</Archive>
<Patches>
<Patch>You_make_ME_sandwich.patch</Patch>
<!--Fedora Patches-->
<Patch>0001-right-click-to-insert-image.patch</Patch>
<Patch>0001-gtk3-implement-opengl-support-for-slideshow.patch</Patch>
<Patch>0001-installation-fix.patch</Patch>
<Patch>0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch</Patch>
<Patch>0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch</Patch>
<Patch>0001-Related-rhbz-1422353-make-writer-behave-like-calc-an.patch</Patch>
<Patch>disable_libe-book.patch</Patch>
</Patches>
<BuildDependencies>
<Dependency>ant</Dependency>
@@ -35,7 +74,7 @@
<Dependency>curl-devel</Dependency>
<Dependency>glew-devel</Dependency>
<Dependency>libXt-devel</Dependency>
<Dependency>lcms2-devel</Dependency>
<Dependency versionFrom="2.8">lcms2-devel</Dependency>
<Dependency>boost-devel</Dependency>
<Dependency>libSM-devel</Dependency>
<Dependency>jdk7-openjdk</Dependency>
@@ -61,12 +100,38 @@
<Dependency versionFrom="2.24.31">gtk2-devel</Dependency>
<Dependency>libatomic_ops-devel</Dependency>
<Dependency>librsvg-devel</Dependency>
<Dependency>unixODBC-devel</Dependency>
<Dependency>serf-devel</Dependency>
<Dependency versionFrom="2.3.4">unixODBC-devel</Dependency>
<Dependency versionFrom="1.3.9">serf-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>graphite2-devel</Dependency>
<Dependency>librevenge-devel</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<Dependency>neon-devel</Dependency>
<Dependency>clucene-devel</Dependency>
<Dependency>apr-devel</Dependency>
<Dependency>mesa-glu-devel</Dependency>
<Dependency>icu4c-devel</Dependency>
<Dependency>gnutls-devel</Dependency>
<Dependency>postgresql-lib</Dependency>
<Dependency>libetonyek-devel</Dependency>
<Dependency>libvisio-devel</Dependency>
<Dependency>doxygen</Dependency>
<Dependency>liblangtag-devel</Dependency>
<Dependency versionFrom="1.2.2">mdds-devel</Dependency>
<Dependency>glew-devel</Dependency>
<Dependency>glm</Dependency>
<Dependency>cppunit-devel</Dependency>
<Dependency>hunspell-devel</Dependency>
<Dependency>libcdr-devel</Dependency>
<Dependency>libmspub-devel</Dependency>
<Dependency>libodfgen-devel</Dependency>
<Dependency>libpagemaker-devel</Dependency>
<Dependency>libwpd-devel</Dependency>
<Dependency>libwpg-devel</Dependency>
<Dependency>libwps-devel</Dependency>
<Dependency>raptor2-devel</Dependency>
<Dependency>rasqal-devel</Dependency>
<Dependency>redland-devel</Dependency>
</BuildDependencies>
</Source>
@@ -3122,8 +3187,8 @@
<History>
<Update release="5">
<Date>2017-02-22</Date>
<Version>5.3.0.3</Version>
<Date>2017-03-05</Date>
<Version>5.3.1.1</Version>
<Comment>Release Bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
@@ -13,29 +13,32 @@
<IsA>library</IsA>
<Summary>A set of Python bindings for the Qt 5.x Toolkit</Summary>
<Description>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.</Description>
<Archive sha1sum="8920e4094470ff93f79e257c37c46f5cd0bff7ab" type="targz">mirrors://sourceforge/pyqt/PyQt5/PyQt-5.6/PyQt5_gpl-5.6.tar.gz</Archive>
<Archive sha1sum="46aae31f8196d4beed878bc70ed9ed2938f3c73f" type="targz">mirrors://sourceforge/pyqt/PyQt5/PyQt-5.7.1/PyQt5_gpl-5.7.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>dbus-devel</Dependency>
<Dependency>dbus-python</Dependency>
<Dependency>dbus-python-common</Dependency>
<Dependency>python-devel</Dependency>
<Dependency versionFrom="4.18">python-sip</Dependency>
<Dependency versionFrom="5.6.0">qt5-base-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-connectivity-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-enginio-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-location-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-serialport-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-svg-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-webkit-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-websockets-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-x11extras-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="4.19">python-sip</Dependency>
<Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-connectivity-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-location-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-serialport-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-svg-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-webkit-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-websockets-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-x11extras-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-quickcontrols2-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-script-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-designer-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>PyQt5_gpl-5.6-dbus_ftbfs.patch</Patch>
<!-- <Patch>PyQt5_gpl-5.6-dbus_ftbfs.patch</Patch> -->
</Patches>
</Source>
@@ -46,38 +49,39 @@
<Dependency>libgcc</Dependency>
<Dependency>dbus</Dependency>
<Dependency>python</Dependency>
<Dependency versionFrom="5.6.0">qt5-base</Dependency>
<Dependency versionFrom="5.6.0">qt5-sensors</Dependency>
<Dependency versionFrom="5.6.0">qt5-location</Dependency>
<Dependency versionFrom="5.6.0">qt5-webkit</Dependency>
<Dependency versionFrom="5.6.0">qt5-enginio</Dependency>
<Dependency versionFrom="5.6.0">qt5-x11extras</Dependency>
<Dependency versionFrom="5.6.0">qt5-svg</Dependency>
<Dependency versionFrom="5.6.0">qt5-multimedia</Dependency>
<Dependency versionFrom="5.6.0">qt5-serialport</Dependency>
<Dependency versionFrom="5.6.0">qt5-webchannel</Dependency>
<Dependency versionFrom="5.6.0">qt5-websockets</Dependency>
<Dependency versionFrom="5.6.0">qt5-declarative</Dependency>
<Dependency versionFrom="5.6.0">qt5-xmlpatterns</Dependency>
<Dependency versionFrom="5.6.0">qt5-connectivity</Dependency>
<Dependency versionFrom="5.7.1">qt5-base</Dependency>
<Dependency versionFrom="5.7.1">qt5-sensors</Dependency>
<Dependency versionFrom="5.7.1">qt5-location</Dependency>
<Dependency versionFrom="5.7.1">qt5-webkit</Dependency>
<Dependency versionFrom="5.7.1">qt5-x11extras</Dependency>
<Dependency versionFrom="5.7.1">qt5-svg</Dependency>
<Dependency versionFrom="5.7.1">qt5-multimedia</Dependency>
<Dependency versionFrom="5.7.1">qt5-serialport</Dependency>
<Dependency versionFrom="5.7.1">qt5-webchannel</Dependency>
<Dependency versionFrom="5.7.1">qt5-websockets</Dependency>
<Dependency versionFrom="5.7.1">qt5-declarative</Dependency>
<Dependency versionFrom="5.7.1">qt5-xmlpatterns</Dependency>
<Dependency versionFrom="5.7.1">qt5-connectivity</Dependency>
<Dependency versionFrom="5.7.1">qt5-designer</Dependency>
<Dependency>python-sip</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/py2uic5</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages</Path>
<Path fileType="library">/usr/lib/qt5/plugins/PyQt5/libpy2qt5qmlplugin.so</Path>
<Path fileType="data">/usr/share/qt5/qsci/api/python/Py2Qt5.api</Path>
<Path fileType="library">/usr/lib/qt5/plugins/designer/libpyqt5.so</Path>
<Path fileType="data">/usr/share/qt5/qsci/api/python/Py2Qt5.api</Path>
<Path fileType="executable">/usr/bin/py2rcc5</Path>
<Path fileType="executable">/usr/bin/py2lupdate5</Path>
<Path fileType="executable">/usr/bin/py2lupdate5</Path>
</Files>
</Package>
<Package>
<Name>python-qt5-devel</Name>
<Summary>Development files for python3-qt5</Summary>
<Summary>Development files for python-qt5</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="5.6.0">qt5-base</Dependency>
<Dependency versionFrom="5.7.1">qt5-base</Dependency>
<Dependency release="current">python-qt5</Dependency>
</RuntimeDependencies>
<Files>
@@ -86,6 +90,13 @@
</Package>
<History>
<Update release="5">
<Date>2017-03-05</Date>
<Version>5.7.1</Version>
<Comment>Version Bump</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2016-06-09</Date>
<Version>5.6</Version>
@@ -115,4 +126,4 @@
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>