Browse Source

updated vlc (0.6.2) and added ffmpeg as well as libmpeg2 for it

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1757 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
commit
7670bbfbf8
6 changed files with 147 additions and 2 deletions
  1. +1
    -0
      Documentation/Developers/CHANGELOG-RENE
  2. +43
    -0
      package/rene/ffmpeg/ffmpeg.desc
  3. +25
    -0
      package/rene/libmpeg2/libmpeg2.conf
  4. +43
    -0
      package/rene/libmpeg2/libmpeg2.desc
  5. +33
    -0
      package/rene/vlc/ffmpeg-compile-fix.patch
  6. +2
    -2
      package/rene/vlc/vlc.desc

+ 1
- 0
Documentation/Developers/CHANGELOG-RENE

@ -2,6 +2,7 @@
*) 2003-11-13 (2.0.0-rc2 - 2.0.0-rc3)
- Sebastian Jaenicke: added zebra security patches
- updated vlc (0.6.2) and added ffmpeg as well as libmpeg2 for it
*) 2003-11-12 (2.0.0-rc2 - 2.0.0-rc3)

+ 43
- 0
package/rene/ffmpeg/ffmpeg.desc

@ -0,0 +1,43 @@
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
[COPY]
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] Please add additional copyright information _after_ the line containing
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/rene/ffmpeg/ffmpeg.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
[COPY] the Free Software Foundation; either version 2 of the License, or
[COPY] (at your option) any later version. A copy of the GNU General Public
[COPY] License can be found at Documentation/COPYING.
[COPY]
[COPY] Many people helped and are helping developing ROCK Linux. Please
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
[COPY] file for details.
[COPY]
[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
[I] A complete audio and video stream library
[T] FFmpeg is a complete solution to record, convert and stream audio and
[T] video. It includes libavcodec, the leading audio/video codec library.
[U] http://ffmpeg.sourceforge.net/
[A] Many - see the CREDITS file
[M] Rene Rebe <rene@rocklinux.org>
[C] extra/multimedia
[L] LGPL
[S] Stable
[V] 0.4.8
[P] X -----5---9 329.000
[D] 0 ffmpeg-0.4.8.tar.gz http://cesnet.dl.sourceforge.net/sourceforge/ffmpeg/

+ 25
- 0
package/rene/libmpeg2/libmpeg2.conf

@ -0,0 +1,25 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/libmpeg2/libmpeg2.conf
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
hook_add preconf 3 "export ac_cv_header_altivec_h=no"

+ 43
- 0
package/rene/libmpeg2/libmpeg2.desc

@ -0,0 +1,43 @@
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
[COPY]
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] Please add additional copyright information _after_ the line containing
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/rene/libmpeg2/libmpeg2.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
[COPY] the Free Software Foundation; either version 2 of the License, or
[COPY] (at your option) any later version. A copy of the GNU General Public
[COPY] License can be found at Documentation/COPYING.
[COPY]
[COPY] Many people helped and are helping developing ROCK Linux. Please
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
[COPY] file for details.
[COPY]
[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
[I] The MPEG Library - version 2
[T] The MPEG Library is a collection of C routines to decode MPEG-1 and MPEG-2
[T] movies and dither them in a variety of colour schemes.
[U] http://libmpeg2.sourceforge.net/
[A] Aaron Holtzman <aholtzma@ess.engr.uvic.ca> {inital implementation}
[A] Michel Lespinasse <walken@zoy.org> {current rewrite}
[M] Rene Rebe <rene@rocklinux.org>
[C] extra/multimedia
[L] GPL
[S] Stable
[V] 0.3.2-snapshot
[P] X -----5---9 329.000
[D] 0 mpeg2dec-snapshot.tar.gz http://libmpeg2.sourceforge.net/files/

+ 33
- 0
package/rene/vlc/ffmpeg-compile-fix.patch

@ -0,0 +1,33 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/vlc/ffmpeg-compile-fix.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- vlc-0.6.2/modules/codec/ffmpeg/ffmpeg.c.orig 2003-11-13 20:20:26.000000000 +0100
+++ vlc-0.6.2/modules/codec/ffmpeg/ffmpeg.c 2003-11-13 20:21:12.000000000 +0100
@@ -297,7 +297,7 @@
b_ffmpeginit = 1;
msg_Dbg( p_decoder->p_fifo, "libavcodec initialized (interface "
- LIBAVCODEC_BUILD_STR ")" );
+ FFMPEG_VERSION ")" );
}
else
{

+ 2
- 2
package/rene/vlc/vlc.desc

@ -38,8 +38,8 @@
[L] GPL
[S] Alpha
[V] 0.5.2
[V] 0.6.2
[P] X -----5---9 822.000
[D] 527113422 vlc-0.5.2.tar.bz2 http://www.videolan.org/pub/videolan/vlc/0.5.2/
[D] 0 vlc-0.6.2.tar.bz2 http://www.videolan.org/pub/videolan/vlc/0.6.2/

Loading…
Cancel
Save