Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (2c9333e7fac2572cf21d21a50f931a56b3434ad3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (2c9333e7fac2572cf21d21a50f931a56b3434ad3)
  • Date: Tue, 19 Aug 2008 01:53:31 -0500

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

dev/null |binary
printer/cups/BUILD | 2 +-
printer/cups/DEPENDS | 2 +-
printer/cups/HISTORY | 5 +++++
video/avidemux2/BUILD | 25 ++++++-------------------
video/avidemux2/DEPENDS | 14 +++++++++++---
video/avidemux2/DETAILS | 2 +-
video/avidemux2/HISTORY | 10 ++++++++++
video/avidemux2/PRE_BUILD | 3 ---
video/avidemux2/avidemux_2.4.2.tar.gz.sig | 0
video/avidemux2/avidemux_2.4.3.tar.gz.sig |binary
11 files changed, 35 insertions(+), 28 deletions(-)

New commits:
commit 2c9333e7fac2572cf21d21a50f931a56b3434ad3
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

cups: in BUILD: switched --without-rcdir and $OPTS to follow best practice
in DEPENDS: fixed suggest_depends, so "to print Postscript files" is not
passed as a configure flag

commit f17e5219c40f9fd8303fd6c283620b7e2f067ef7
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

avidemux2: updated version to 2.4.3
switched from autotools to cmake => removed autoconf and automake
dependencies and added cmake dependency
removed CFLAGS and CXXFLAGS downgrade, removed disable_pic
removed libmozjs detection and GECKO dependency since 2.4.x branch no
longer need external libmozjs
removed PRE_BUILD as it's no longer needed with cmake build
added optional dependencies on libdca and x264

diff --git a/printer/cups/BUILD b/printer/cups/BUILD
index 75fd852..ea7a6a4 100755
--- a/printer/cups/BUILD
+++ b/printer/cups/BUILD
@@ -1,5 +1,5 @@
# prevent install of init scripts
-OPTS="$OPTS --without-rcdir" &&
+OPTS="--without-rcdir $OPTS" &&

# set language options
if [[ $EXTRA_LANG == n ]]; then
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index 1e5f3c5..c44abe3 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -40,4 +40,4 @@ optional_depends 'openslp'
\
'--disable-slp' \
'to use the Service Location Protocol for discovery'

-suggest_depends POSTSCRIPT-INTERPRETER 'to print Postscript files'
+suggest_depends POSTSCRIPT-INTERPRETER '' '' 'to print Postscript files'
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 3fd97ff..dfad4dc 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,8 @@
+2008-08-18 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * BUILD: switched --without-rcdir and $OPTS to follow best practice
+ * DEPENDS: fixed suggest_depends, so "to print Postscript files" is
+ not passed as a configure flag
+
2008-07-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.8, quoting the paths!

diff --git a/video/avidemux2/BUILD b/video/avidemux2/BUILD
index 381103f..2e55edc 100755
--- a/video/avidemux2/BUILD
+++ b/video/avidemux2/BUILD
@@ -1,19 +1,6 @@
-# this is recommended by the author
-CFLAGS=${CFLAGS/-O3/-O2} &&
-CXXFLAGS=${CXXFLAGS/-O3/-O2} &&
-# doesn't compile with -DPIC -fPIC, bug #8426
-disable_pic &&
-if test "$(get_spell_provider $SPELL GECKO)" = "firefox"; then
- OPTS="--with-jsapi-include=/usr/include/firefox/js/" &&
- LDFLAGS="-L/usr/lib/firefox -Wl,-rpath -Wl,/usr/lib/firefox"
-elif test "$(get_spell_provider $SPELL GECKO)" = "seamonkey"; then
- OPTS="--with-jsapi-include=/usr/include/seamonkey-$(installed_version
seamonkey)/js" &&
- LDFLAGS="-L/usr/lib/seamonkey -Wl,-rpath -Wl,/usr/lib/seamonkey"
-elif test "$(get_spell_provider $SPELL GECKO)" = "xulrunner"; then
- OPTS="--with-jsapi-include=/usr/include/xulrunner-$(installed_version
xulrunner)/js" &&
- LDFLAGS="-L/usr/lib/xulrunner -Wl,-rpath -Wl,/usr/lib/xulrunner"
-else
- OPTS="--with-jsapi-include=/usr/include/mozilla-$(installed_version
mozilla)/js" &&
- LDFLAGS="-L/usr/lib/mozilla -Wl,-rpath -Wl,/usr/lib/mozilla"
-fi &&
-default_build
+if is_depends_enabled $SPELL qt4; then
+ OPTS="-DQT_QMAKE_EXECUTABLE=${INSTALL_ROOT}/usr/bin/qt4/qmake
-DLRELEASE_EXECUTABLE=${INSTALL_ROOT}/usr/bin/qt4/lrelease $OPTS"
+fi &&
+
+OPTS="-DCMAKE_INSTALL_PREFIX=${INSTALL_ROOT}/usr $OPTS" &&
+cmake_build
diff --git a/video/avidemux2/DEPENDS b/video/avidemux2/DEPENDS
index a87e582..556a633 100755
--- a/video/avidemux2/DEPENDS
+++ b/video/avidemux2/DEPENDS
@@ -1,8 +1,6 @@
-depends autoconf &&
-depends automake &&
+depends cmake &&
depends g++ &&
depends libxml2 &&
-depends GECKO &&

optional_depends gtk+2 "" "" "for gtk+2 gui" &&
optional_depends qt4 "" "" "for Qt gui" &&
@@ -17,6 +15,11 @@ optional_depends a52dec \
"" \
"for AC3 audio decoding" &&

+optional_depends libdca \
+ "" \
+ "" \
+ "for DTS audio decoding" &&
+
optional_depends lame \
"" \
"" \
@@ -32,6 +35,11 @@ optional_depends xvid \
"" \
"for xvid video encoding" &&

+optional_depends x264 \
+ "" \
+ "" \
+ "for H264 video encoding" &&
+
optional_depends freetype2 \
"" \
"" \
diff --git a/video/avidemux2/DETAILS b/video/avidemux2/DETAILS
index 88743f1..6ca4950 100755
--- a/video/avidemux2/DETAILS
+++ b/video/avidemux2/DETAILS
@@ -1,5 +1,5 @@
SPELL=avidemux2
- VERSION=2.4.2
+ VERSION=2.4.3
SOURCE=avidemux_$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/avidemux_$VERSION
SOURCE_URL[0]=http://download.berlios.de/avidemux/$SOURCE
diff --git a/video/avidemux2/HISTORY b/video/avidemux2/HISTORY
index fecfe7c..14c8df0 100644
--- a/video/avidemux2/HISTORY
+++ b/video/avidemux2/HISTORY
@@ -1,3 +1,13 @@
+2008-08-18 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.4.3
+ * BUILD: switched from autotools to cmake, removed CFLAGS and CXXFLAGS
+ downgrade, removed disable_pic, removed libmozjs detection since
2.4.x
+ branch no longer need external libmozjs,
+ * PRE_BUILD: removed, not needed with cmake build
+ * DEPENDS: removed autoconf and automake, removed GECKO as no external
+ libmozjs is needed in 2.4.x branch, added cmake and optional
+ dependency on libdca and x264
+
2008-07-20 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.4.2

diff --git a/video/avidemux2/PRE_BUILD b/video/avidemux2/PRE_BUILD
deleted file mode 100755
index 03886a8..0000000
--- a/video/avidemux2/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-make -f Makefile.dist
diff --git a/video/avidemux2/avidemux_2.4.2.tar.gz.sig
b/video/avidemux2/avidemux_2.4.2.tar.gz.sig
deleted file mode 100644
index 69c3f7c..0000000
Binary files a/video/avidemux2/avidemux_2.4.2.tar.gz.sig and /dev/null differ
diff --git a/video/avidemux2/avidemux_2.4.3.tar.gz.sig
b/video/avidemux2/avidemux_2.4.3.tar.gz.sig
new file mode 100644
index 0000000..af6be0f
Binary files /dev/null and b/video/avidemux2/avidemux_2.4.3.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (2c9333e7fac2572cf21d21a50f931a56b3434ad3), Julien ROZO, 08/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page