Skip to Content.
Sympa Menu

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

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 (9d9993c070ecfd1c4b577b5171bbaa2018fd4d69)
  • Date: Sun, 26 Oct 2008 10:01:08 -0500

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

database/libinterbasexx/BUILD | 2 +-
database/tokyocabinet/DETAILS | 4 ++--
database/tokyocabinet/HISTORY | 3 +++
disk/partimage-ng/CONFIGURE | 1 +
disk/partimage-ng/DEPENDS | 10 +++++++---
disk/partimage-ng/DETAILS | 14 +++++++++-----
disk/partimage-ng/DOWNLOAD | 23 +++++++++++++++++++++++
disk/partimage-ng/HISTORY | 10 ++++++++++
disk/partimage-ng/PREPARE | 2 ++
disk/partimage-ng/PRE_BUILD | 9 +++++++++
disk/partimage-ng/e2fs.diff | 23 +++++++++++++++++++++++
video-libs/xine-lib/HISTORY | 5 +++++
video-libs/xine-lib/PRE_BUILD | 10 +++-------
video-libs/xine-lib/ffmpeg.patch | 24 ++++++++++++++++++++++++
14 files changed, 122 insertions(+), 18 deletions(-)

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

xine-lib - fix use of latest ffmpeg

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

libinterbasexx/BUILD - missing file

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

"tokyocabinet-1.3.15"

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

partimage-ng - add bzr version, fix e2fs problems

diff --git a/database/libinterbasexx/BUILD b/database/libinterbasexx/BUILD
index 1008a81..0068c9c 100755
--- a/database/libinterbasexx/BUILD
+++ b/database/libinterbasexx/BUILD
@@ -1,4 +1,4 @@
-export FIREBIRD=/usr/firebird &&
+export FIREBIRD=/opt/firebird &&
OPTS="--enable-shared $OPTS" &&
default_build

diff --git a/database/tokyocabinet/DETAILS b/database/tokyocabinet/DETAILS
index 907f008..0a655e7 100755
--- a/database/tokyocabinet/DETAILS
+++ b/database/tokyocabinet/DETAILS
@@ -1,6 +1,6 @@
SPELL=tokyocabinet
- VERSION=1.3.14
-
SOURCE_HASH=sha512:7d5490416f40789b03b26bd564503804195b9308789d470bc6538688090672044e57e33719e8c27044062d714ff0b082c5178051aef95c81f67e09b2a8cb8d86
+ VERSION=1.3.15
+
SOURCE_HASH=sha512:b156129a0b9a7cf35cfcfcef27159a9ae31c54e8b4f77ef51cda5f53060cbeffac1a2d36fa303bfae9d2d986d8d471e60d95489410dbf026b25b5c6430a5ef43
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://$SPELL.sf.net/$SOURCE
diff --git a/database/tokyocabinet/HISTORY b/database/tokyocabinet/HISTORY
index 504e947..9d05f34 100644
--- a/database/tokyocabinet/HISTORY
+++ b/database/tokyocabinet/HISTORY
@@ -1,3 +1,6 @@
+2008-10-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.15
+
2008-10-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.14

diff --git a/disk/partimage-ng/CONFIGURE b/disk/partimage-ng/CONFIGURE
new file mode 100755
index 0000000..bd6e94b
--- /dev/null
+++ b/disk/partimage-ng/CONFIGURE
@@ -0,0 +1 @@
+config_query_list PART_NTFS 'which NTFS support?' ntfs-3g ntfsprogs
diff --git a/disk/partimage-ng/DEPENDS b/disk/partimage-ng/DEPENDS
index 48fbf74..d010a32 100755
--- a/disk/partimage-ng/DEPENDS
+++ b/disk/partimage-ng/DEPENDS
@@ -1,8 +1,12 @@
+if [[ $PART_VCS == y ]];then
+ depends bzr &&
+ depends boost &&
+ depends $PART_NTFS
+else
+ depends ntfsprogs
+fi &&
depends cmake &&
depends g++ &&
depends parted &&
-depends ntfsprogs &&
depends e2fsprogs
-#optional_depends ntfsprogs '' '' 'NTFS support' &&
-#optional_depends e2fsprogs '' '' 'ext2/ext3 support'

diff --git a/disk/partimage-ng/DETAILS b/disk/partimage-ng/DETAILS
index b4cbf7a..49f5910 100755
--- a/disk/partimage-ng/DETAILS
+++ b/disk/partimage-ng/DETAILS
@@ -1,13 +1,17 @@
SPELL=partimage-ng
+if [[ $PART_VCS == y ]];then
+ VERSION=vcs
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=lp:~gene-czarc/partimage-ng/devel-gc2
+ SOURCE_IGNORE=volatile
+# FORCE_DOWNL=on
+else
VERSION=r80

SOURCE_HASH=sha512:7e2642fb957f58f9c17e50918b5d8a78266e56686fb0bb5cff6c2cc789b0835738d07c7f23c891a82098641a473c2646a9a12180315db683c14de24b52396cfd
SOURCE=$SPELL-$VERSION.tar.gz
-# SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_URL[0]=http://launchpad.net/partimage-ng/devel/$VERSION/+download/$SOURCE
-# SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-# SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
-# SOURCE2_IGNORE=signature
+fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://partimage-ng.org
LICENSE[0]=GPL
ENTERED=20080224
diff --git a/disk/partimage-ng/DOWNLOAD b/disk/partimage-ng/DOWNLOAD
new file mode 100755
index 0000000..01bca92
--- /dev/null
+++ b/disk/partimage-ng/DOWNLOAD
@@ -0,0 +1,23 @@
+bzr_download() {
+local OLD
+OLD=$SOURCE_CACHE/$SOURCE
+if [[ -e $OLD ]];then
+ echo unpacking old tarball
+ tar xjf $OLD
+ cd $SPELL
+ echo updating source tree
+ bzr update
+ cd -
+else
+ echo fetching source tree
+ bzr checkout $SOURCE_URL $SPELL
+fi
+echo repacking tarball
+tar cjf $SOURCE $SPELL
+mv $SOURCE $OLD
+}
+if [[ $PART_VCS == y ]];then
+ bzr_download
+else
+ default_download
+fi
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index 0adb53d..734c662 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,13 @@
+2008-10-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * e2fs.diff: added, to fix compile with latest e2fsprogs
+ * PRE_BUILD: apply e2fs patch
+
+2008-08-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * PREPARE, CONFIGURE, DOWNLOAD: added, for vcs support
+ * DEPENDS, DETAILS: add vcs support
+ * DEPENDS: add ntfs-3g support, add boost
+ * PRE_BUILD: fix for ntfs-3g
+
2008-08-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: use http instead of https for download
* DOWNLOAD: deleted
diff --git a/disk/partimage-ng/PREPARE b/disk/partimage-ng/PREPARE
new file mode 100755
index 0000000..bdfbabd
--- /dev/null
+++ b/disk/partimage-ng/PREPARE
@@ -0,0 +1,2 @@
+config_query PART_VCS 'use VCS version?' n
+
diff --git a/disk/partimage-ng/PRE_BUILD b/disk/partimage-ng/PRE_BUILD
index 69b0619..6038bf4 100755
--- a/disk/partimage-ng/PRE_BUILD
+++ b/disk/partimage-ng/PRE_BUILD
@@ -1,5 +1,14 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+if [[ $PART_VCS == y ]];then
+ if spell_ok ntfs-3g;then
+ sed -i '/set(NTFS3G_PREFERRED/s/0/1/' src/CMakeLists.txt
+ fi
+else
+# fix glibc problem
sed -i -e '/<fcntl.h>/ a\
#include <langinfo.h>
' src/imager.cpp
+fi &&
+# fix compile with recent e2fsprogs
+patch -p1 -i $SPELL_DIRECTORY/e2fs.diff
diff --git a/disk/partimage-ng/e2fs.diff b/disk/partimage-ng/e2fs.diff
new file mode 100644
index 0000000..38e2809
--- /dev/null
+++ b/disk/partimage-ng/e2fs.diff
@@ -0,0 +1,23 @@
+diff -uNr partimage-ng.orig/src/CMakeLists.txt
partimage-ng/src/CMakeLists.txt
+ # check C library; need macro def HAVE_STDARG_H for libntfs
+diff -uNr partimage-ng.orig/src/ext2partition.h
partimage-ng/src/ext2partition.h
+--- partimage-ng.orig/src/ext2partition.h 2008-09-26 08:55:12.000000000
+0200
++++ partimage-ng/src/ext2partition.h 2008-10-26 09:50:55.000000000 +0100
+@@ -19,6 +19,17 @@
+ #define PARTIMAGENG_EXT2PARTITION
+
+ #include <ext2fs/ext2fs.h>
++struct ext2fs_struct_generic_bitmap {
++ errcode_t magic;
++ ext2_filsys fs;
++ __u32 start, end;
++ __u32 real_end;
++ char * description;
++ char * bitmap;
++ errcode_t base_error_code;
++ __u32 reserved[7];
++};
++
+ #include <sys/types.h>
+
+ #include "partition.h"
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 574250c..4e023b5 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,8 @@
+2008-10-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * ffmpeg.patch: added, for latest ffmpeg (from upstream)
+ * PRE_BUILD: apply ffmpeg.patch
+ remove some obsolete sedit's
+
2008-09-17 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: made libxcb optional, completed options for sdl,
pulseaudio and libcaca
diff --git a/video-libs/xine-lib/PRE_BUILD b/video-libs/xine-lib/PRE_BUILD
index 97e95c2..d33425e 100755
--- a/video-libs/xine-lib/PRE_BUILD
+++ b/video-libs/xine-lib/PRE_BUILD
@@ -1,9 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i "32i#include <limits.h>" src/input/vcd/libcdio/_cdio_linux.c &&
-# fix a typo (missing quoting) so detection of ffmpeg-cvs works correctly
-# compiles but fails to run otherwise
-sedit 's/x$FFMPEG_POSTPROC_LIBS/"\0"/' configure &&
-sedit 's/$(FFMPEG_LIBS)/\0 $(FFMPEG_POSTPROC_LIBS)/' \
- src/libffmpeg/Makefile.in &&
-patch -p1 < $SPELL_DIRECTORY/xine-lib-gcc.patch
+patch -p1 < $SPELL_DIRECTORY/xine-lib-gcc.patch &&
+# fix for latest ffmpeg
+patch -p1 < $SPELL_DIRECTORY/ffmpeg.patch
diff --git a/video-libs/xine-lib/ffmpeg.patch
b/video-libs/xine-lib/ffmpeg.patch
new file mode 100644
index 0000000..bb3cbdc
--- /dev/null
+++ b/video-libs/xine-lib/ffmpeg.patch
@@ -0,0 +1,24 @@
+--- a/src/combined/ffmpeg/ff_audio_decoder.c Fri Sep 05 21:26:59 2008
+0200
++++ b/src/combined/ffmpeg/ff_audio_decoder.c Sat Sep 13 12:48:10 2008
+0100
+@@ -322,7 +322,7 @@ static void ff_audio_decode_data (audio_
+
+ if (!this->output_open) {
+ if (!this->audio_bits || !this->audio_sample_rate ||
!this->audio_channels) {
+- avcodec_decode_audio (this->context,
++ avcodec_decode_audio2 (this->context,
+ (int16_t *)this->decode_buffer,
+ &decode_buffer_size,
+ &this->buf[0],
+--- a/src/combined/ffmpeg/ffmpeg_decoder.h Fri Sep 05 21:26:59 2008
+0200
++++ b/src/combined/ffmpeg/ffmpeg_decoder.h Sat Sep 13 12:48:10 2008
+0100
+@@ -33,6 +33,10 @@
+ # include "../../libffmpeg/libavcodec/avcodec.h"
+ #endif
+
++#if LIBAVCODEC_VERSION_MAJOR > 51
++#define bits_per_sample bits_per_coded_sample
++#endif
++
+ typedef struct ff_codec_s {
+ uint32_t type;
+ enum CodecID id;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9d9993c070ecfd1c4b577b5171bbaa2018fd4d69), Treeve Jelbert, 10/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page