Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (e5987f86724e22b29dbc06ead2cc0566c1915f69)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (e5987f86724e22b29dbc06ead2cc0566c1915f69)
  • Date: Sun, 25 Apr 2010 15:12:36 -0500

GIT changes to devel-gcc grimoire by Eric Sandall <sandalle AT sourcemage.org>:

audio-libs/libtunepimp/DEPENDS | 1 +
audio-libs/libtunepimp/HISTORY | 7 +++++++
audio-libs/libtunepimp/PRE_BUILD | 10 +++++++++-
audio-libs/libtunepimp/mp4v2-1.9.patch | 33
+++++++++++++++++++++++++++++++++
doc/xpdf/BUILD | 2 +-
doc/xpdf/HISTORY | 4 ++++
ftp/aria2/DETAILS | 4 ++--
ftp/aria2/HISTORY | 3 +++
libs/boost/BUILD | 6 +++++-
libs/boost/HISTORY | 6 ++++++
libs/boost/PRE_BUILD | 4 ++++
libs/boost/boost-use-cxxflags.patch | 17 +++++++++++++++++
libs/libvirt/BUILD | 5 +++++
libs/libvirt/HISTORY | 3 +++
utils/syslinux/BUILD | 1 +
utils/syslinux/HISTORY | 3 +++
video/ffmpeg-svn/BUILD | 5 +++++
video/ffmpeg-svn/HISTORY | 3 +++
video/vlc/BUILD | 4 ++++
video/vlc/HISTORY | 3 +++
20 files changed, 119 insertions(+), 5 deletions(-)

New commits:
commit 8ead659f70bdcea8e1683e32c5a1e4366df98354
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

boost: Remove a debug statement

commit edc578ac969701241f8f9e456956357592500948
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

boost: Add '-Wno-strict-aliasing' to CXXFLAGS (Bug #15694)
Apply boost-use-cxxflags.patch (Required to fix Bug #15694)
from
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/boost/current/SOURCES/boost-use-cxxflags.patch?view=markup

commit f45faace5baea31291f6b42081959082860a7ea6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xpdf: Disable building libpaper library (Bug #15066)

See http://www.openoffice.org/issues/show_bug.cgi?id=94981

commit 1ab8d894bd74c0df1fad2d74321f2ee42540bfd7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libtunepimp: Print messages describing what we're patching

commit 52647620eb6d05749b3ade4b7878493e9ab14c1b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libtunepimp: Optionally depends on any provider of MP4V2 (Bug #15687)
Apply mp4v2-1.9.patch if mp4v2 is providing MP4V2 (Bug #15687)
mp4v2-1.9.patch modified from
http://repos.archlinux.org/wsvn/packages/tunepimp/trunk/mp4v2-1.9.patch

commit 86cac90ca208b1f9f64bde01c0894fced5e9f77b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libvirt: Fails to compile with -Wl,--as-needed in LDFLAG

make[3]: Entering directory `/usr/src/libvirt-0.7.4/daemon'
CCLD libvirtd

../src/.libs/libvirt_driver_nodedev.a(libvirt_driver_nodedev_la-node_device_driver.o):
In function `nodedevRegister':
node_device_driver.c:(.text+0x84): undefined reference to
`halNodeRegister'
collect2: ld returned 1 exit status
make[3]: *** [libvirtd] Error 1

commit 8100ed62538376bd1dd90a791c7185e05ba2c470
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

vlc: Disable -Wl,--as-needed in LDFLAGS when building goom (Bug #15219)

commit b86501557026ce5bdbe8ada43dcd0e416c61c8d5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ffmpeg-svn: Cannot find -lxvid with -Wl,--as-needed in LDFLAGS

commit 6a8a1f0eb363e3fb9e24d7f51b7f6dc13efcba94
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

syslinux: Disable --as-needed in LDFLAGS

commit 1d3d45f795495f4630842f73eabd3ac5d9605bba
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

aria2: => 1.9.1

diff --git a/audio-libs/libtunepimp/DEPENDS b/audio-libs/libtunepimp/DEPENDS
index c9bcca1..030abcb 100755
--- a/audio-libs/libtunepimp/DEPENDS
+++ b/audio-libs/libtunepimp/DEPENDS
@@ -3,6 +3,7 @@ if [[ "${LIBTUNEPIMP_PYTHON}" == "y" ]]
then depends python
fi &&
depends libofa &&
+optional_depends MP4V2 "" "" "for MPEG4 support" &&
optional_depends libmad "" "" "mp3 support?" &&
optional_depends libvorbis "" "" "ogg support?" &&
optional_depends flac "" "" "FLAC support?" &&
diff --git a/audio-libs/libtunepimp/HISTORY b/audio-libs/libtunepimp/HISTORY
index 9667e51..4618c08 100644
--- a/audio-libs/libtunepimp/HISTORY
+++ b/audio-libs/libtunepimp/HISTORY
@@ -1,3 +1,10 @@
+2010-04-25 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on any provider of MP4V2 (Bug #15687)
+ * PRE_BUILD: Apply mp4v2-1.9.patch if mp4v2 is providing MP4V2 (Bug
#15687)
+ Print messages describing what we're patching
+ * mp4v2-1.9.patch: Modified from
+
http://repos.archlinux.org/wsvn/packages/tunepimp/trunk/mp4v2-1.9.patch
+
2010-04-20 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply gcc44.patch (Bug #15641 and
http://bugs.musicbrainz.org/ticket/5722)
diff --git a/audio-libs/libtunepimp/PRE_BUILD
b/audio-libs/libtunepimp/PRE_BUILD
index df5554d..d345568 100755
--- a/audio-libs/libtunepimp/PRE_BUILD
+++ b/audio-libs/libtunepimp/PRE_BUILD
@@ -1,5 +1,13 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+message "${MESSAGE_COLOR}Patching for GCC 4.3...${DEFAULT_COLOR}" &&
zcat $SCRIPT_DIRECTORY/gcc43.patch | patch -p1 &&
+message "${MESSAGE_COLOR}Patching for GCC 4.4...${DEFAULT_COLOR}" &&
patch $SOURCE_DIRECTORY/lib/fileio.cpp \
- $SCRIPT_DIRECTORY/gcc44.patch
+ $SCRIPT_DIRECTORY/gcc44.patch &&
+
+if [[ "$(get_spell_provider $SPELL MP4V2)" == "mp4v2" ]]; then
+ message "${MESSAGE_COLOR}Patching for mp4v2...${DEFAULT_COLOR}" &&
+ patch $SOURCE_DIRECTORY/plugins/mp4/mp4.cpp \
+ $SCRIPT_DIRECTORY/mp4v2-1.9.patch
+fi
diff --git a/audio-libs/libtunepimp/mp4v2-1.9.patch
b/audio-libs/libtunepimp/mp4v2-1.9.patch
new file mode 100644
index 0000000..1390918
--- /dev/null
+++ b/audio-libs/libtunepimp/mp4v2-1.9.patch
@@ -0,0 +1,33 @@
+#
+# Modified from
http://repos.archlinux.org/wsvn/packages/tunepimp/trunk/mp4v2-1.9.patch
+#
+diff -Naur libtunepimp-0.5.3.orig/plugins/mp4/mp4.cpp
libtunepimp-0.5.3/plugins/mp4/mp4.cpp
+--- libtunepimp-0.5.3.orig/plugins/mp4/mp4.cpp 2010-04-25 11:37:06.008834579
-0700
++++ libtunepimp-0.5.3/plugins/mp4/mp4.cpp 2010-04-25 11:38:10.811115622
-0700
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <cstdlib>
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ #include "metadata.h"
+ #include "plugin.h"
+ #ifndef WIN32
+@@ -232,7 +232,7 @@
+
+ strcpy(mdata->fileFormat, fileName + strlen(fileName) - 3);
+
+- if (!MP4Close(mp4file))
++ MP4Close(mp4file);
+ return 0;
+
+ return 1;
+@@ -316,7 +316,7 @@
+ sprintf(temp, "%d", mdata->nonAlbum);
+ MP4SetMetadataFreeForm(mp4file, "MusicBrainz Non-Album", (u_int8_t
*)temp, strlen(temp) + 1);
+
+- if (!MP4Close(mp4file))
++ MP4Close(mp4file);
+ return 0;
+
+ #ifndef WIN32
diff --git a/doc/xpdf/BUILD b/doc/xpdf/BUILD
index e59d6b5..8bb765d 100755
--- a/doc/xpdf/BUILD
+++ b/doc/xpdf/BUILD
@@ -1,6 +1,6 @@
CFLAGS="$CFLAGS -I/usr/include/freetype2"
CXXFLAGS="$CFLAGS"
CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-OPTS="$OPTS --enable-multithreaded $A4_PAPER"
+OPTS="$OPTS --without-libpaper-library --enable-multithreaded $A4_PAPER"

default_build
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index 5eee2b2..635908e 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,7 @@
+2010-04-25 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Disable building libpaper library (Bug #15066)
+ See http://www.openoffice.org/issues/show_bug.cgi?id=94981
+
2009-10-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PRE_BUILD: added xpdf-3.02pl4.patch, SECURITY_PATCH=6
* PRE_BUILD: added unpack_files
diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index ada3a87..d4d7e1f 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,6 +1,6 @@
SPELL=aria2
- VERSION=1.9.0
-
SOURCE_HASH=sha512:df1ad18388d7e321319ecf8adfac7824d9aa9fd46830904bbece494e12808ce79ee7e7b849f0d33f7d71980ef302e3c5c1c35037ce9d1282e78c7e17b59a94a3
+ VERSION=1.9.1
+
SOURCE_HASH=sha512:591417c8b1f13269ea005b3015ff49765f3a2378fea16b89d6ea90430ee9e084428cede7a560d44dc041876bd025da18af557a2d7add908166db8905316be2a7
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index d0722b6..4edcdbb 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-25 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 1.9.1
+
2010-03-13 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 1.9.0

diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index a00eb8a..25b947c 100755
--- a/libs/boost/BUILD
+++ b/libs/boost/BUILD
@@ -1,3 +1,8 @@
+#
+# Fix compilation with GCC 4.4
+#
+CXXFLAGS="-Wno-strict-aliasing $CXXFLAGS" &&
+
local BLIST="" &&
local BL &&
if list_find "${BOOST_LIBS}" "all" ; then
@@ -15,7 +20,6 @@ if list_find "${BOOST_LIBS}" "graph" ||
local EXPAT_LIBPATH=/usr/include
fi &&
OPTS="$OPTS $BLIST" &&
-echo $OPTS
CXXFLAGS="$CXXFLAGS" \
EXPAT_INCLUDE=$EXPAT_INCLUDE \
EXPAT_LIBPATH=$EXPAT_LIBPATH \
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 4c46f2a..d24016c 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,9 @@
+2010-04-25 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply boost-use-cxxflags.patch (Required to fix Bug
#15694)
+ * BUILD: Add '-Wno-strict-aliasing' to CXXFLAGS (Bug #15694)
+ * boost-use-cxxflags.patch: Allow providing our own CXXFLAGS
+ From
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/boost/current/SOURCES/boost-use-cxxflags.patch?view=markup
+
2010-02-08 Sukneet <skipinder AT gmail.com>
* DETAILS: updated spell to 1_42_0; bug #15595

diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
new file mode 100755
index 0000000..5950e2c
--- /dev/null
+++ b/libs/boost/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Allow providing our own
CXXFLAGS...${DEFAULT_COLOR}" &&
+patch $SOURCE_DIRECTORY/tools/build/v2/tools/gcc.jam \
+ $SCRIPT_DIRECTORY/boost-use-cxxflags.patch
diff --git a/libs/boost/boost-use-cxxflags.patch
b/libs/boost/boost-use-cxxflags.patch
new file mode 100644
index 0000000..5da4d25
--- /dev/null
+++ b/libs/boost/boost-use-cxxflags.patch
@@ -0,0 +1,17 @@
+#
+# From
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/boost/current/SOURCES/boost-use-cxxflags.patch?view=markup
+#
+diff -p -up boost_1_39_0/tools/build/v2/tools/gcc.jam.cxxflags~
boost_1_39_0/tools/build/v2/tools/gcc.jam
+--- boost_1_39_0/tools/build/v2/tools/gcc.jam.cxxflags~ 2009-01-14
15:31:12.000000000 +0100
++++ boost_1_39_0/tools/build/v2/tools/gcc.jam 2009-07-17 18:12:20.000000000
+0200
+@@ -298,8 +298,9 @@ generators.override gcc.compile.c++.pch
+ toolset.flags gcc.compile PCH_FILE <pch>on : <pch-file> ;
+
+ # Declare flags and action for compilation.
++local CXXFLAGS = [ os.environ BOOST_BUILD_PATH ] ;
+ toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
+-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
++toolset.flags gcc.compile OPTIONS <optimization>speed : [ modules.peek :
CXXFLAGS ] ;
+ toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
+
+ toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
diff --git a/libs/libvirt/BUILD b/libs/libvirt/BUILD
index 2771a88..473780b 100755
--- a/libs/libvirt/BUILD
+++ b/libs/libvirt/BUILD
@@ -2,4 +2,9 @@ OPTS="$LIBVIRT_REMOTE \
$LIBVIRT_LIBVIRTD \
$OPTS" &&

+#
+# Fails to compile with -Wl,--as-needed
+#
+LDFLAGS=${LDFLAGS/-Wl,--as-needed} &&
+
default_build
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index f54c690..3abdd4b 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,6 @@
+2010-04-25 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Fails to compile with -Wl,--as-needed in LDFLAGS
+
2010-01-05 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: Create libvirt group
* DEPENDS: Doesn't use devicekit anymore
diff --git a/utils/syslinux/BUILD b/utils/syslinux/BUILD
index 65692a7..051f422 100755
--- a/utils/syslinux/BUILD
+++ b/utils/syslinux/BUILD
@@ -10,5 +10,6 @@ CXXFLAGS=${CXXFLAGS/-DPIC} &&
#
LDFLAGS=${LDFLAGS/-Wl,-O1} &&
LDFLAGS=${LDFLAGS/-Wl,--hash-style=gnu} &&
+LDFLAGS=${LDFLAGS/-Wl,--as-needed} &&

make
diff --git a/utils/syslinux/HISTORY b/utils/syslinux/HISTORY
index 0854443..3f52f58 100644
--- a/utils/syslinux/HISTORY
+++ b/utils/syslinux/HISTORY
@@ -1,3 +1,6 @@
+2010-04-25 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Disable --as-needed in LDFLAGS
+
2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Disable -O1 and --hash-style=gnu in LDFLAGS

diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
index f867c41..93adc26 100755
--- a/video/ffmpeg-svn/BUILD
+++ b/video/ffmpeg-svn/BUILD
@@ -1,5 +1,10 @@
disable_pic &&

+#
+# Cannot find -lxvid with -Wl,--as-needed in LDFLAGS
+#
+LDFLAGS=${LDFLAGS/-Wl,--as-needed} &&
+
#if [ $FFAMR != none ];then
# OPTS="--enable-lib$FFAMR $FFMPEG_SWSCALE $OPTS"
#fi &&
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index c138175..b3f950c 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,6 @@
+2010-04-25 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Cannot find -lxvid with -Wl,--as-needed in LDFLAGS
+
2009-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* TRIGGERS: added, for x264

diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index 144c63e..535a385 100755
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -30,6 +30,10 @@ if is_depends_enabled $SPELL qt4; then
export UIC="${INSTALL_ROOT}/usr/bin/qt4/uic"
fi &&

+if is_depends_enabled $SPELL goom; then
+ LDFLAGS=${LDFLAGS/-Wl,--as-needed}
+fi &&
+
default_build &&

export -n MOC RCC UIC &&
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 78ef34f..6f7e659 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2010-04-25 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Disable -Wl,--as-needed in LDFLAGS when building goom (Bug
#15219)
+
2010-04-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.6




  • [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (e5987f86724e22b29dbc06ead2cc0566c1915f69), Eric Sandall, 04/25/2010

Archive powered by MHonArc 2.6.24.

Top of Page