[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam-software-compilation] /: port++
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2016-03-31 22:09:53
Message-ID: E1alkmn-0007CV-Eo () scm ! kde ! org
[Download RAW message or body]

Git commit d67fe9a6495f0970be7c2be4d4b5cd0c049e9e89 by Gilles Caulier.
Committed on 31/03/2016 at 22:09.
Pushed by cgilles into branch 'master'.

port++

M  +4    -3    bootstrap.macports
M  +2    -0    project/macosx/bundle/02-build-digikam.sh
M  +3    -2    project/macosx/bundle/KF5DEPENDENCIES
M  +11   -3    project/macosx/common/common.sh

http://commits.kde.org/scratch/mwiesweg/digikam-sc/d67fe9a6495f0970be7c2be4d4b5cd0c049e9e89


diff --git a/bootstrap.macports b/bootstrap.macports
index 508fdfa..8fd4b7b 100755
--- a/bootstrap.macports
+++ b/bootstrap.macports
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2008-2015, Gilles Caulier, <caulier dot gilles at gmail dot com>
+# Copyright (c) 2008-2016, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -54,10 +54,11 @@ cmake -G "$MAKEFILES_TYPE" . \
       -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
       -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}/ \
       -DCMAKE_OSX_ARCHITECTURES=${TARGET_TYPE} \
+      $ADDITIONAL_CMAKE_FLAGS \
       -DBUILD_TESTING=OFF \
       -DDIGIKAMSC_CHECKOUT_PO=OFF \
       -DDIGIKAMSC_COMPILE_PO=OFF \
-      -DDIGIKAMSC_COMPILE_DOC=ON \
+      -DDIGIKAMSC_COMPILE_DOC=OFF \
       -DDIGIKAMSC_COMPILE_LIBKIPI=OFF \
       -DDIGIKAMSC_COMPILE_LIBKSANE=OFF \
       -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=OFF \
@@ -67,7 +68,7 @@ cmake -G "$MAKEFILES_TYPE" . \
       -DENABLE_AKONADICONTACTSUPPORT=OFF \
       -DENABLE_INTERNALMYSQL=OFF \
       -DENABLE_MYSQLSUPPORT=OFF \
-      -DENABLE_MEDIAPLAYER=ON \
+      -DENABLE_MEDIAPLAYER=OFF \
       -DAPPLE_SUPPRESS_X11_WARNING=ON \
       -DCMAKE_COLOR_MAKEFILE=ON \
       -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
diff --git a/project/macosx/bundle/02-build-digikam.sh \
b/project/macosx/bundle/02-build-digikam.sh index ddeaf17..5b8d5cf 100755
--- a/project/macosx/bundle/02-build-digikam.sh
+++ b/project/macosx/bundle/02-build-digikam.sh
@@ -61,6 +61,7 @@ InstallKDEExtraLib "ki18n"
 InstallKDEExtraLib "kcrash"
 InstallKDEExtraLib "kdoctools"
 
+# NOTE : see http://kde-core-devel.kde.narkive.com/Uoj5HRzH/building-kio-on-mac
 ln -s "${INSTALL_PREFIX}/share/kf5/" "/private/var/root/Library/Application \
Support/kf5"  
 InstallKDEExtraLib "kcodecs"
@@ -80,6 +81,7 @@ InstallKDEExtraLib "kxmlgui"
 InstallKDEExtraLib "kbookmarks"
 InstallKDEExtraLib "kjobwidgets"
 InstallKDEExtraLib "kio"
+InstallKDEExtraLib "phonon" "-DPHONON_BUILD_PHONON4QT5=ON \
-DPHONON_BUILD_DESIGNER_PLUGIN=OFF -DPHONON_BUILD_EXPERIMENTAL=OFF" \
"http://download.kde.org/stable/phonon/4.8.3/src/"  InstallKDEExtraLib \
"knotifications"  InstallKDEExtraLib "knotifyconfig"
 
diff --git a/project/macosx/bundle/KF5DEPENDENCIES \
b/project/macosx/bundle/KF5DEPENDENCIES index 1e90100..95ddfa3 100644
--- a/project/macosx/bundle/KF5DEPENDENCIES
+++ b/project/macosx/bundle/KF5DEPENDENCIES
@@ -17,5 +17,6 @@ kbookmarks          : kcodecs, kconfigwidgets, kconfig, \
kcoreaddons, kiconthemes  kio                 : karchive, kconfig, kcoreaddons, \
                kdbusaddons, ki18n, kservice, kdoctools, solid, kbookmarks, \
                kcompletion,          :
                     : kconfigwidgets, kiconthemes, kitemviews, kjobwidgets, \
kwidgetsaddons, kwidowsystem                                : KIOCORE_ONLY=OFF  \
kservice            : kcrash, kconfig, kcoreaddons, kdbusaddons, ki18n, kdoctools     \
                : -
-knotifications      : kwindowsystem, kconfig, kcodecs, kcoreaddons, phonon4qt5       \
                : -
-knotifyconfig       : kcompletion, phonon4qt5, kio, kconfig, ki18n                   \
:  +phonon				: opengl, 																													: PHONON_BUILD_PHONON4QT5=ON \
PHONON_BUILD_DESIGNER_PLUGIN=OFF PHONON_BUILD_EXPERIMENTAL=OFF +knotifications      : \
kwindowsystem, kconfig, kcodecs, kcoreaddons, phonon                                  \
: - +knotifyconfig       : kcompletion, phonon, kio, kconfig, ki18n                   \
                : 
diff --git a/project/macosx/common/common.sh b/project/macosx/common/common.sh
index 114a549..da0399d 100755
--- a/project/macosx/common/common.sh
+++ b/project/macosx/common/common.sh
@@ -136,12 +136,20 @@ echo -e "---------- Detected OSX version 10.$MAJOR_OSX_VERSION \
and code name $OS  
 ########################################################################
 # Install extra KF5 frameworks library
-# argument : library name 
+# arguments : library name, additional cmake flags, download url 
 #
 InstallKDEExtraLib()
 {
 
 LIB_NAME=$1
+ADDITIONAL_CMAKE_FLAGS=$2
+DURL=$3
+
+if [[ $3 == "" ]]; then
+	DURL=$KD_URL
+else
+	DURL=$3
+fi
 
 if [ $SILENT_OP -ne 0 ]; then
     VERBOSE_MAKE="-s"
@@ -166,9 +174,9 @@ cd "$KD_BUILDTEMP"
 echo -e "\n\n"
 
 echo "---------- Downloading $LIB_NAME $KD_VERSION"
-echo "---------- URL: $KD_URL/$KD_VERSION/$LIB_NAME-$KD_VERSION.tar.xz"
+echo "---------- URL: $DURL/$KD_VERSION/$LIB_NAME-$KD_VERSION.tar.xz"
 
-curl -L -o "$LIB_NAME-$KD_VERSION.tar.xz" \
"$KD_URL/$KD_VERSION/$LIB_NAME-$KD_VERSION.0.tar.xz" $VERBOSE_CONF +curl -L -o \
"$LIB_NAME-$KD_VERSION.tar.xz" "$DURL/$KD_VERSION/$LIB_NAME-$KD_VERSION.0.tar.xz" \
$VERBOSE_CONF  if [ $? -ne 0 ] ; then
     echo "---------- Cannot download $LIB_NAME-$KD_VERSION.tar.xz archive."
     echo "---------- Aborting..."


[prev in list] [next in list] [prev in thread] [next in thread]