diff --git a/general.ent b/general.ent
index f50b2b4c89..31c4d5e2b1 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index a78ddd9e3a..941c9c2f34 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,24 @@
-->
+
+ April 20th, 2016
+
+
+ [bdubbs] - Update to phonon-4.9.0. Fixes
+ #7741.
+
+
+ [bdubbs] - Update to phonon-backend-gstreamer-4,9,0. Fixes
+ #7742.
+
+
+ [bdubbs] - Update to phonon-backend-vlc-0.9.0. Fixes
+ #7743.
+
+
+
+
April 19th, 2016
diff --git a/kde/phonon-backend-gstreamer.xml b/kde/phonon-backend-gstreamer.xml
index f6f7aa5bc5..282edf281f 100644
--- a/kde/phonon-backend-gstreamer.xml
+++ b/kde/phonon-backend-gstreamer.xml
@@ -4,12 +4,12 @@
%general-entities;
-
-
-
+
+
+
-
-
+
+
]>
@@ -31,9 +31,7 @@
This package provides a Phonon backend
which utilizes the GStreamer media framework.
-
+
&lfs79_checked;
@@ -59,16 +57,6 @@
- Additional Downloads
-
-
-
- Required download:
-
-
-
-
-
Phonon-backend-gstreamer DependenciesRequired
@@ -94,32 +82,12 @@
Installation of Phonon-backend-gstreamer
- Fix the package to work with the latest gstreamer:
+ This package unpacks to the directory
+ phonon-gstreamer-&phonon-backend-gstreamer-version;.
+
-patch -Np1 -i ../phonon-backend-gstreamer-&phonon-backend-gstreamer-version;-compatibility-1.patch
-
- Install
- Phonon-backend-gstreamer by running the
- following commands:
+ Install Phonon-backend-gstreamer by
+ running the following commands:source /usr/bin/setqt5 &&
@@ -130,7 +98,6 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \
-DPHONON_BUILD_PHONON4QT5=ON \
- -D__KDE_HAVE_GCC_VISIBILITY=NO \
-Wno-dev .. &&
make
@@ -153,9 +120,6 @@ make
: This switch is used to
ensure that Qt5 version of the backend is built even if Qt4 is present.
- : This switch is used to
- disable a check that would cause cmake to fail when using Qt-5.4.2 or later.
-
@@ -181,7 +145,7 @@ make
phonon
- is a testing utility for phonon-backend-gstreamer-generated build trees.
+ is placeholder.phonon
diff --git a/kde/phonon-backend-vlc.xml b/kde/phonon-backend-vlc.xml
index 3806ed3422..de7a6a3bce 100644
--- a/kde/phonon-backend-vlc.xml
+++ b/kde/phonon-backend-vlc.xml
@@ -4,12 +4,12 @@
%general-entities;
-
-
-
+
+
+
-
-
+
+
]>
@@ -30,10 +30,8 @@
Introduction to the Phonon-backend-vlcThis package provides a Phonon backend
- which utilizes the VLC media framework.
+ which utilizes the VLC media framework.
+
&lfs79_checked;
@@ -74,27 +72,13 @@
Installation of Phonon-backend-vlc
-
- Install i
+ Install
Phonon-backend-vlc by running the following
commands:
@@ -107,7 +91,6 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \
-DPHONON_BUILD_PHONON4QT5=ON \
- -D__KDE_HAVE_GCC_VISIBILITY=NO \
-Wno-dev .. &&
make
@@ -130,9 +113,6 @@ make
: This switch is used to
ensure that Qt5 version of the backend is built even if Qt4 is present.
- : This switch is used to
- disable a check that would cause cmake to fail when using Qt-5.4.2 or later.
-
@@ -158,7 +138,7 @@ make
phonon
- is a testing utility for phonon-backend-vlc-generated build trees.
+ placeholderphonon
diff --git a/kde/phonon.xml b/kde/phonon.xml
index a21a85d011..a9e2e5c5f3 100644
--- a/kde/phonon.xml
+++ b/kde/phonon.xml
@@ -4,12 +4,12 @@
%general-entities;
-
-
-
+
+
+
-
-
+
+
]>
@@ -63,13 +63,12 @@
,
, and
-
+ Optional
- and
- QZeitgeist
+ User Notes:
@@ -79,52 +78,11 @@
Installation of Phonon
-
Install Phonon by
running the following commands:source /usr/bin/setqt5 &&
-sed -i "s:BSD_SOURCE:DEFAULT_SOURCE:g" cmake/FindPhononInternal.cmake &&
-
mkdir build &&
cd build &&
@@ -132,7 +90,6 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_LIBDIR=lib \
-DPHONON_BUILD_PHONON4QT5=ON \
- -D__KDE_HAVE_GCC_VISIBILITY=NO \
-Wno-dev .. &&
make
@@ -145,11 +102,6 @@ make
Command Explanations
-
- sed ... cmake/FindPhononInternal.cmake: Silence
- a lot of warnings caused by the latest toolchain.
-
-
-DCMAKE_BUILD_TYPE=Release: This switch is used
to apply higher level of the compiler optimizations.
@@ -160,24 +112,12 @@ make
This switch ensures that the plugins and mkspecs files get installed in
the correct location.
-
-
- -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces:
- This switch sets the correct installation path for the
- D-Bus interfaces file.
-
-->
-DPHONON_BUILD_PHONON4QT5=ON: This switch is used to
ensure that Qt5 version of the library is built even if Qt4 is present.
-
- -D__KDE_HAVE_GCC_VISIBILITY=NO: This switch is used to
- disable a check that would cause cmake to fail when using Qt-5.4.2
- and later.
-
-
diff --git a/packages.ent b/packages.ent
index a979f6ae1e..b70f1869a8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -552,9 +552,9 @@
-
-
-
+
+
+