Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (17807e747a90dd4ba8206a7b230dbece8788f825)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (17807e747a90dd4ba8206a7b230dbece8788f825)
  • Date: Fri, 8 Jul 2016 18:30:58 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5-cmake/qca-qt5/BUILD | 1
qt5-cmake/qca-qt5/HISTORY | 4 +
qt5-cmake/qca-qt5/PRE_BUILD | 4 +
qt5-cmake/qca-qt5/ssl.diff | 88 +++++++++++++++++++++++++
qt5-cmake/qt-gstreamer/FindGStreamer.cmake | 101
+++++++++++++++++++++++++++++
qt5-cmake/qt-gstreamer/HISTORY | 4 +
qt5-cmake/qt-gstreamer/PRE_BUILD | 1
7 files changed, 203 insertions(+)

New commits:
commit 17807e747a90dd4ba8206a7b230dbece8788f825
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qca-qt - fix build wiht openssl-2.4.x

commit cce78f1cdb9e5d3e7107aadfe90d2ff19d912537
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qt-gstreamer - fix build

diff --git a/qt5-cmake/qca-qt5/BUILD b/qt5-cmake/qca-qt5/BUILD
index 1e45c34..00cebf7 100755
--- a/qt5-cmake/qca-qt5/BUILD
+++ b/qt5-cmake/qca-qt5/BUILD
@@ -1,2 +1,3 @@
+CXXFLAGS+=" -Wno-cpp"
OPTS+=' -DBUILD_TESTS=0'
default_build
diff --git a/qt5-cmake/qca-qt5/HISTORY b/qt5-cmake/qca-qt5/HISTORY
index 6fc7dbe..1fa7978 100644
--- a/qt5-cmake/qca-qt5/HISTORY
+++ b/qt5-cmake/qca-qt5/HISTORY
@@ -1,3 +1,7 @@
+2016-07-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * ssl.diff. PRE_BUILD: added
+ fix build qith openssl-2.4.x
+
2015-10-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.1.1
now one tarball for qt4/5 support
diff --git a/qt5-cmake/qca-qt5/PRE_BUILD b/qt5-cmake/qca-qt5/PRE_BUILD
new file mode 100755
index 0000000..7f458f7
--- /dev/null
+++ b/qt5-cmake/qca-qt5/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/plugins/qca-ossl &&
+patch -p0 < $SPELL_DIRECTORY/ssl.diff &&
+cd $SOURCE_DIRECTORY
diff --git a/qt5-cmake/qca-qt5/ssl.diff b/qt5-cmake/qca-qt5/ssl.diff
new file mode 100644
index 0000000..615af0b
--- /dev/null
+++ b/qt5-cmake/qca-qt5/ssl.diff
@@ -0,0 +1,88 @@
+--- qca-ossl.cpp.orig 2016-07-08 18:02:53.000000000 +0200
++++ qca-ossl.cpp 2016-07-08 20:19:02.000000000 +0200
+@@ -37,6 +37,7 @@
+ #include <openssl/x509v3.h>
+ #include <openssl/pkcs12.h>
+ #include <openssl/ssl.h>
++#include <openssl/sha.h>
+
+ #ifndef OSSL_097
+ // comment this out if you'd rather use openssl 0.9.6
+@@ -1930,9 +1931,13 @@
+ virtual void startSign(SignatureAlgorithm alg, SignatureFormat)
+ {
+ const EVP_MD *md = 0;
++#ifndef OPENSSL_NO_SHA1
+ if(alg == EMSA3_SHA1)
+ md = EVP_sha1();
+ else if(alg == EMSA3_MD5)
++#else
++ if(alg == EMSA3_MD5)
++#endif
+ md = EVP_md5();
+ #ifdef HAVE_OPENSSL_MD2
+ else if(alg == EMSA3_MD2)
+@@ -1958,9 +1963,13 @@
+ virtual void startVerify(SignatureAlgorithm alg, SignatureFormat)
+ {
+ const EVP_MD *md = 0;
++#ifndef OPENSSL_NO_SHA1
+ if(alg == EMSA3_SHA1)
+ md = EVP_sha1();
+ else if(alg == EMSA3_MD5)
++#else
++ if(alg == EMSA3_MD5)
++#endif
+ md = EVP_md5();
+ #ifdef HAVE_OPENSSL_MD2
+ else if(alg == EMSA3_MD2)
+@@ -5403,9 +5412,11 @@
+ ctx = SSL_CTX_new(SSLv2_client_method());
+ break;
+ #endif
++#ifndef OPENSSL_NO_SSL2
+ case TLS::SSL_v3:
+ ctx = SSL_CTX_new(SSLv3_client_method());
+ break;
++#endif
+ case TLS::TLS_v1:
+ ctx = SSL_CTX_new(TLSv1_client_method());
+ break;
+@@ -7131,10 +7142,15 @@
+ return new opensslRandomContext(this);
+ else if ( type == "info" )
+ return new opensslInfoContext(this);
++#ifndef OPENSSL_NO_SHA1
+ else if ( type == "sha1" )
+ return new opensslHashContext( EVP_sha1(), this,
type);
++#else
++/*
+ else if ( type == "sha0" )
+ return new opensslHashContext( EVP_sha(), this, type);
++*/
++#endif
+ else if ( type == "ripemd160" )
+ return new opensslHashContext( EVP_ripemd160(), this,
type);
+ #ifdef HAVE_OPENSSL_MD2
+@@ -7167,8 +7183,10 @@
+ return new opensslHashContext( EVP_whirlpool(), this,
type);
+ #endif
+ */
++#ifndef OPENSSL_NO_SHA1
+ else if ( type == "pbkdf1(sha1)" )
+ return new opensslPbkdf1Context( EVP_sha1(), this,
type );
++#endif
+ #ifdef HAVE_OPENSSL_MD2
+ else if ( type == "pbkdf1(md2)" )
+ return new opensslPbkdf1Context( EVP_md2(), this,
type );
+@@ -7177,8 +7195,10 @@
+ return new opensslPbkdf2Context( this, type );
+ else if ( type == "hmac(md5)" )
+ return new opensslHMACContext( EVP_md5(), this, type
);
++#ifndef OPENSSL_NO_SHA1
+ else if ( type == "hmac(sha1)" )
+ return new opensslHMACContext( EVP_sha1(),this, type
);
++#endif
+ #ifdef SHA224_DIGEST_LENGTH
+ else if ( type == "hmac(sha224)" )
+ return new opensslHMACContext( EVP_sha224(), this,
type);
diff --git a/qt5-cmake/qt-gstreamer/FindGStreamer.cmake
b/qt5-cmake/qt-gstreamer/FindGStreamer.cmake
new file mode 100644
index 0000000..1375b30
--- /dev/null
+++ b/qt5-cmake/qt-gstreamer/FindGStreamer.cmake
@@ -0,0 +1,101 @@
+# - Try to find GStreamer
+# Once done this will define
+#
+# GSTREAMER_FOUND - system has GStreamer
+# GSTREAMER_INCLUDE_DIR - the GStreamer include directory
+# GSTREAMER_LIBRARIES - the libraries needed to use GStreamer
+# GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer
+# GSTREAMER_VERSION - the version of GStreamer
+
+# Copyright (c) 2008 Helio Chissini de Castro, <helio AT kde.org>
+# (c)2006, Tim Beaulen <tbscope AT gmail.com>
+
+# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND
and GSTREAMER_1.0_FOUND etc)
+
+
+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY
AND GSTREAMER_APP_LIBRARY)
+ # in cache already
+ SET(GStreamer_FIND_QUIETLY TRUE)
+ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND
GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
+ SET(GStreamer_FIND_QUIETLY FALSE)
+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND
GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
+
+IF (NOT WIN32)
+ FIND_PACKAGE(PkgConfig REQUIRED)
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ # don't make this check required - otherwise you can't use
macro_optional_find_package on this one
+ PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-1.0)
+ SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION})
+ SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
+ENDIF (NOT WIN32)
+
+FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
+ PATHS
+ ${PKG_GSTREAMER_INCLUDE_DIRS}
+ PATH_SUFFIXES gstreamer-1.0
+ )
+
+IF (NOT GSTREAMER_INCLUDE_DIR)
+ MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
+ENDIF (NOT GSTREAMER_INCLUDE_DIR)
+
+# Newer versions of GStreamer put gst-config.h under
lib/gstreamer-1.0/include
+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
+ PATHS
+ ${PKG_GSTREAMER_INCLUDE_DIRS}
+ PATH_SUFFIXES gstreamer-1.0 gstreamer-1.0/include
+ )
+
+IF (NOT GSTREAMER_CONF_INCLUDE_DIR)
+ MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found")
+ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR)
+
+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
+ IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR)
+ LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}")
+ ENDIF()
+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
+
+FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
+ PATHS
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
+ )
+
+FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0
+ PATHS
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
+ )
+
+FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0
+ PATHS
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
+ )
+
+IF (GSTREAMER_LIBRARIES)
+ELSE (GSTREAMER_LIBRARIES)
+ MESSAGE(STATUS "GStreamer: WARNING: library not found")
+ENDIF (GSTREAMER_LIBRARIES)
+
+if (GSTREAMER_APP_LIBRARY)
+ELSE (GSTREAMER_APP_LIBRARY)
+ MESSAGE(STATUS "GStreamer: WARNING: app library not found")
+ENDIF (GSTREAMER_APP_LIBRARY)
+
+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY
AND GSTREAMER_APP_LIBRARY)
+ SET(GSTREAMER_FOUND TRUE)
+ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND
GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
+ SET(GSTREAMER_FOUND FALSE)
+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND
GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
+
+IF (GSTREAMER_FOUND)
+ IF (NOT GStreamer_FIND_QUIETLY)
+ MESSAGE(STATUS "Found GStreamer: ${GSTREAMER_LIBRARIES}")
+ ENDIF (NOT GStreamer_FIND_QUIETLY)
+ELSE (GSTREAMER_FOUND)
+ IF (GStreamer_FIND_REQUIRED)
+ MESSAGE(SEND_ERROR "Could NOT find GStreamer")
+ ENDIF (GStreamer_FIND_REQUIRED)
+ENDIF (GSTREAMER_FOUND)
+
+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES
GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY GSTREAMER_APP_LIBRARY)
diff --git a/qt5-cmake/qt-gstreamer/HISTORY b/qt5-cmake/qt-gstreamer/HISTORY
index 2f37a4b..ea8d806 100644
--- a/qt5-cmake/qt-gstreamer/HISTORY
+++ b/qt5-cmake/qt-gstreamer/HISTORY
@@ -1,3 +1,7 @@
+2016-07-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD, FindGStreamer.cmake: use FindGStreamer from
phonon4qt5-gstreamer
+ fixes build wiht recent gstreamer
+
2015-04-05 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: qtquick1 is optional

diff --git a/qt5-cmake/qt-gstreamer/PRE_BUILD
b/qt5-cmake/qt-gstreamer/PRE_BUILD
index a6f0dac..37f72e9 100755
--- a/qt5-cmake/qt-gstreamer/PRE_BUILD
+++ b/qt5-cmake/qt-gstreamer/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
sed -i '/CACHE/s/4/5/' cmake/modules/FindQt4or5.cmake
+cp $SPELL_DIRECTORY/FindGStreamer.cmake cmake/modules



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (17807e747a90dd4ba8206a7b230dbece8788f825), Treeve Jelbert, 07/08/2016

Archive powered by MHonArc 2.6.24.

Top of Page