Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by David Kowis (d2e5a6ee08fa9c09f4792b7c7cd0a965d82aeb78)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by David Kowis (d2e5a6ee08fa9c09f4792b7c7cd0a965d82aeb78)
  • Date: Thu, 3 May 2007 20:05:00 +0200

On Sat, Apr 28, 2007 at 09:25:17AM -0500, David Kowis wrote:
> GIT changes to master grimoire by David Kowis <dkowis AT shlrm.org>:
>
> video-libs/avifile/DETAILS | 6 +++---
> video-libs/avifile/HISTORY | 5 +++++
> video-libs/avifile/PRE_BUILD | 1 -
> video-libs/avifile/avifile-fixes.patch | 24 ------------------------
> video-libs/xvid/DEPENDS | 4 +---
> video-libs/xvid/HISTORY | 2 ++
> 6 files changed, 11 insertions(+), 31 deletions(-)
>
> New commits:
> commit d2e5a6ee08fa9c09f4792b7c7cd0a965d82aeb78
> Author: David Kowis <dkowis AT shlrm.org>
> Commit: David Kowis <dkowis AT shlrm.org>
>
> avifile
> Version updated to the latest
>
> commit ea3b08490b89aa499ca6d18790f5b30f662c70e2
> Author: David Kowis <dkowis AT shlrm.org>
> Commit: David Kowis <dkowis AT shlrm.org>
>
> xvid
> Disabled use of yasm in amd64. It simply doesn't work.
> xvid will build and everything, but the .so is not PIC compatible and so
> nothing can link against it in. If we enable statics on the progs that
> use
> xvid then it will work. That's what gentoo does. This, however, requires
> less modification and will work. It can always be changed
> Reference:
> http://list.xvid.org/pipermail/xvid-devel/2006-January/005305.html

Nice catch. This has been reported a few times as bugs I couldn't figure
out.

> diff --git a/video-libs/avifile/DETAILS b/video-libs/avifile/DETAILS
> index ae7aa78..2ec5d04 100755
> --- a/video-libs/avifile/DETAILS
> +++ b/video-libs/avifile/DETAILS
> @@ -1,10 +1,10 @@
> SPELL=avifile
> MVERSION=0.7
> - VERSION=0.7.41
> - SOURCE=$SPELL-$MVERSION-$VERSION.tar.gz
> + VERSION=0.7.45
> + SOURCE=$SPELL-$MVERSION-$VERSION.tar.bz2
> SOURCE_DIRECTORY=$BUILD_DIRECTORY/avifile-$MVERSION-$VERSION
> SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
> -
> SOURCE_HASH=sha512:28e434fcf16d2ed9db45b5dbe11df744941e442515256c4beafa8420ed54cb7f87e946c40d02c4b3c39ce360c72ba1317dc529bc0ac13be1ddb640c6e7822e51
> +
> SOURCE_HASH=sha512:0751be7ce811f67b960c8c66ba6ca47c297041672095ecc289632d3e9d1d3e7ef4eeacf34c06a313c56f71d68bae9b59b6aa22cb36bf3a1041e1431fb6839c58
> WEB_SITE=http://avifile.sourceforge.net
> ENTERED=20020111
> UPDATED=20041228
> diff --git a/video-libs/avifile/HISTORY b/video-libs/avifile/HISTORY
> index 90aef6a..0118753 100644
> --- a/video-libs/avifile/HISTORY
> +++ b/video-libs/avifile/HISTORY
> @@ -1,3 +1,8 @@
> +2007-04-28 David Kowis <dkowis AT shlrm.org>
> + * DETAILS: version bumped to 0.7.45
> + * PRE_BUILD: removed patch, as it doesn't apply
> + * avifile-fixes.patch: deleted, doesn't apply
> +
> 2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
> * DETAILS: (automated) Add KEYWORDS
>
> diff --git a/video-libs/avifile/PRE_BUILD b/video-libs/avifile/PRE_BUILD
> index 4c0b015..ad15d9f 100755
> --- a/video-libs/avifile/PRE_BUILD
> +++ b/video-libs/avifile/PRE_BUILD
> @@ -1,6 +1,5 @@
> default_pre_build &&
> cd $SOURCE_DIRECTORY &&
> -patch -p0 < $SCRIPT_DIRECTORY/avifile-fixes.patch &&
> # fix the pkgconfig file, avifile install header to include/avifile-0.7,
> # not include/avifile
> sedit 's:\(@includedir@/avifile\):\1-0.7:' avifile.pc.in
> diff --git a/video-libs/avifile/avifile-fixes.patch
> b/video-libs/avifile/avifile-fixes.patch
> deleted file mode 100644
> index 6fcd2d8..0000000
> --- a/video-libs/avifile/avifile-fixes.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> ---- include/utils.h~ 2006-02-28 18:17:21.000000000 +0100
> -+++ include/utils.h 2006-02-28 18:17:35.000000000 +0100
> -@@ -4,6 +4,10 @@
> - #include "avm_default.h"
> - #include "formats.h"
> -
> -+#ifndef __cplusplus
> -+#define __THROW
> -+#endif
> -+
> - /**
> - * Utility functions.
> - * plain C functions are here
> ---- lib/aviread/ReadFile.cpp~ 2006-02-28 18:06:55.000000000 +0100
> -+++ lib/aviread/ReadFile.cpp 2006-02-28 18:07:58.000000000 +0100
> -@@ -125,7 +125,7 @@
> - };
> -
> -
> --avm::IReadFile* avm::CreateReadFile(const char* name, unsigned int flags)
> -+avm::IReadFile* CreateReadFile(const char* name, unsigned int flags)
> - {
> - ReadFile* r = new ReadFile(name, flags);
> - return r;
> diff --git a/video-libs/xvid/DEPENDS b/video-libs/xvid/DEPENDS
> index cd78ed4..bc77d9c 100755
> --- a/video-libs/xvid/DEPENDS
> +++ b/video-libs/xvid/DEPENDS
> @@ -1,5 +1,3 @@
> -if test "${SMGL_COMPAT_ARCHS[1]}" = "x86_64"; then
> - optional_depends yasm "" "--disable-assembly" "for faster code"
> -elif test "${SMGL_COMPAT_ARCHS[1]}" = "ia32"; then
> +if test "${SMGL_COMPAT_ARCHS[1]}" = "ia32"; then
> optional_depends X86-ASSEMBLER "" "--disable-assembly" "for faster
> code"
> fi
> diff --git a/video-libs/xvid/HISTORY b/video-libs/xvid/HISTORY
> index 8a54732..de14e3e 100644
> --- a/video-libs/xvid/HISTORY
> +++ b/video-libs/xvid/HISTORY
> @@ -1,5 +1,7 @@
> 2007-04-28 David Kowis <dkowis AT shlrm.org>
> * DETAILS: version bumped to 1.1.2
> + * DEPENDS: although building with yasm works, nothing can link against
> + it. Can't build xvid on amd64 with yasm and actually use it :(
>
> 2006-04-13 Arwed v. Merkatz <v.merkatz AT gmx.net>
> * DETAILS: SOURCE_URL files.xvid.org -> downloads.xvid.org (bug
> #10864)
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit

--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org



  • Re: [SM-Commit] GIT changes to master grimoire by David Kowis (d2e5a6ee08fa9c09f4792b7c7cd0a965d82aeb78), Arwed von Merkatz, 05/03/2007

Archive powered by MHonArc 2.6.24.

Top of Page