rpms/vlc/devel vlc.spec,1.20,1.21
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4476
Modified Files:
vlc.spec
Log Message:
Still needed in 0.9-bugfix land
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vlc.spec 16 Jan 2009 16:21:19 -0000 1.20
+++ vlc.spec 16 Jan 2009 16:25:37 -0000 1.21
@@ -280,7 +280,7 @@
%patch8 -p1 -b .postproc
%patch9 -p1 -b .vlc099
-#chmod -x modules/gui/qt4/qt4*
+chmod -x modules/gui/qt4/qt4*
#./bootstrap
autoreconf
libtoolize
@@ -298,7 +298,7 @@
popd
%endif
-export MOZILLA_CFLAGS="$(pkg-config --cflags libxul) -DHAVE_NPFUNCTIONS_H"
+
%configure \
--disable-dependency-tracking \
--disable-rpath \
15 years, 10 months
rpms/vlc/devel 0001-Mozilla-SDK-libxul-1.9.1-preliminary-support.patch, NONE, 1.1 0002-Fix-the-config.h-reference-that-was-only-present-in.patch, NONE, 1.1 vlc-backport-postproc_unif.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 vlc.spec, 1.19, 1.20 vlc-embeddedvideo.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4097/devel
Modified Files:
.cvsignore sources vlc.spec
Added Files:
0001-Mozilla-SDK-libxul-1.9.1-preliminary-support.patch
0002-Fix-the-config.h-reference-that-was-only-present-in.patch
vlc-backport-postproc_unif.patch
Removed Files:
vlc-embeddedvideo.patch
Log Message:
libxul 1.9.1 fix and postproc backport
0001-Mozilla-SDK-libxul-1.9.1-preliminary-support.patch:
--- NEW FILE 0001-Mozilla-SDK-libxul-1.9.1-preliminary-support.patch ---
>From b7fc1a472af08965e62df22eeb740d67970c78e1 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet (kwizart) <kwizart(a)gmail.com>
Date: Tue, 13 Jan 2009 18:51:01 +0100
Subject: [PATCH] Mozilla SDK libxul 1.9.1 - preliminary support
According to https://bugzilla.mozilla.org/show_bug.cgi?id=455458
npupp.h has been renamed to npfunctions.h with libxul 1.9.1
---
configure.ac | 1 +
projects/mozilla/support/npmac.cpp | 4 ++++
projects/mozilla/support/npunix.c | 4 ++++
projects/mozilla/support/npwin.cpp | 4 ++++
4 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index ec2284e..5bd1e9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5509,6 +5509,7 @@ then
AS_IF( [test $found = 1],[
CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
MOZILLA_REQUIRED_HEADERS=1
+ AC_CHECK_HEADERS([npfunctions.h])
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
diff --git a/projects/mozilla/support/npmac.cpp b/projects/mozilla/support/npmac.cpp
index ccc3945..394c4c9 100644
--- a/projects/mozilla/support/npmac.cpp
+++ b/projects/mozilla/support/npmac.cpp
@@ -54,7 +54,11 @@
#undef XP_UNIX
#endif
+#ifdef HAVE_NPFUNCTIONS_H
+#include "npfunctions.h"
+#else
#include "npupp.h"
+#endif
#ifdef __MWERKS__
#ifndef powerc
diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
index 26c6736..573f1f9 100644
--- a/projects/mozilla/support/npunix.c
+++ b/projects/mozilla/support/npunix.c
@@ -43,7 +43,11 @@
#include <stdio.h>
#include <npapi.h>
+#ifdef HAVE_NPFUNCTIONS_H
+#include <npfunctions.h>
+#else
#include <npupp.h>
+#endif
/*
* Define PLUGIN_TRACE to have the wrapper functions print
diff --git a/projects/mozilla/support/npwin.cpp b/projects/mozilla/support/npwin.cpp
index c277f84..d9a0a9c 100644
--- a/projects/mozilla/support/npwin.cpp
+++ b/projects/mozilla/support/npwin.cpp
@@ -42,7 +42,11 @@
#endif
#include "npapi.h"
+#ifdef HAVE_NPFUNCTIONS_H
+#include "npfunctions.h"
+#else
#include "npupp.h"
+#endif
//\\// DEFINE
#define NP_EXPORT
--
1.6.0.6
0002-Fix-the-config.h-reference-that-was-only-present-in.patch:
--- NEW FILE 0002-Fix-the-config.h-reference-that-was-only-present-in.patch ---
>From 2554044286d3697dcf1679f6e34413b9e7988066 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet (kwizart) <kwizart(a)gmail.com>
Date: Fri, 16 Jan 2009 02:56:30 +0100
Subject: [PATCH] Fix the config.h reference that was only present in npwin.cpp
---
projects/mozilla/support/npmac.cpp | 2 ++
projects/mozilla/support/npunix.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/projects/mozilla/support/npmac.cpp b/projects/mozilla/support/npmac.cpp
index 394c4c9..d5901bf 100644
--- a/projects/mozilla/support/npmac.cpp
+++ b/projects/mozilla/support/npmac.cpp
@@ -4,6 +4,8 @@
//
//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+#include "config.h"
+
#include <string.h>
#include <Processes.h>
diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
index 573f1f9..59de292 100644
--- a/projects/mozilla/support/npunix.c
+++ b/projects/mozilla/support/npunix.c
@@ -38,6 +38,8 @@
*----------------------------------------------------------------------
*/
+#include "config.h"
+
#define XP_UNIX 1
#define OJI 1
--
1.6.0.6
vlc-backport-postproc_unif.patch:
--- NEW FILE vlc-backport-postproc_unif.patch ---
diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 74e0db1..dde9495 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -100,6 +100,9 @@ struct picture_t
bool b_progressive; /**< is it a progressive frame ? */
unsigned int i_nb_fields; /**< # of displayed fields */
bool b_top_field_first; /**< which field is first */
+ uint8_t *p_q; /**< quantification table */
+ int i_qstride; /**< quantification stride */
+ int i_qtype; /**< quantification style */
/**@}*/
/** The picture heap we are attached to */
@@ -158,6 +161,17 @@ static inline void picture_Release( picture_t *p_picture )
}
/**
+ * Cleanup quantization matrix data and set to 0
+ */
+static inline void picture_CleanupQuant( picture_t *p_pic )
+{
+ free( p_pic->p_q );
+ p_pic->p_q = NULL;
+ p_pic->i_qstride = 0;
+ p_pic->i_qtype = 0;
+}
+
+/**
* This function will copy all picture dynamic properties.
*/
static inline void picture_CopyProperties( picture_t *p_dst, const picture_t *p_src )
@@ -168,6 +182,8 @@ static inline void picture_CopyProperties( picture_t *p_dst, const picture_t *p_
p_dst->b_progressive = p_src->b_progressive;
p_dst->i_nb_fields = p_src->i_nb_fields;
p_dst->b_top_field_first = p_src->b_top_field_first;
+
+ /* FIXME: copy ->p_q and ->p_qstride */
}
/**
@@ -240,6 +256,11 @@ struct picture_heap_t
#define DISPLAYED_PICTURE 5 /* been displayed but is linked */
#define DESTROYED_PICTURE 6 /* allocated but no more used */
+/* Quantification type */
+#define QTYPE_MPEG1 0
+#define QTYPE_MPEG2 1
+#define QTYPE_H264 2
+
/*****************************************************************************
* Shortcuts to access image components
*****************************************************************************/
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 2baffa8..38d63d6 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -643,6 +643,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
/* Send decoded frame to vout */
if( p_sys->i_pts )
{
+ int i;
p_pic->date = p_sys->i_pts;
ffmpeg_NextPts( p_dec, p_block->i_rate );
@@ -658,6 +659,24 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
p_pic->b_progressive = !p_sys->p_ff_pic->interlaced_frame;
p_pic->b_top_field_first = p_sys->p_ff_pic->top_field_first;
+ p_pic->i_qstride = p_sys->p_ff_pic->qstride;
+ int i_mb_h = ( p_pic->format.i_height + 15 ) / 16;
+ p_pic->p_q = malloc( p_pic->i_qstride * i_mb_h );
+ memcpy( p_pic->p_q, p_sys->p_ff_pic->qscale_table,
+ p_pic->i_qstride * i_mb_h );
+ switch( p_sys->p_ff_pic->qscale_type )
+ {
+ case FF_QSCALE_TYPE_MPEG1:
+ p_pic->i_qtype = QTYPE_MPEG1;
+ break;
+ case FF_QSCALE_TYPE_MPEG2:
+ p_pic->i_qtype = QTYPE_MPEG2;
+ break;
+ case FF_QSCALE_TYPE_H264:
+ p_pic->i_qtype = QTYPE_H264;
+ break;
+ }
+
return p_pic;
}
else
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index cb1a988..3c3f2fd 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -198,14 +198,24 @@ static int VideoAutoMenuBuilder( vlc_object_t *p_object,
if( p_object )
{
- vlc_object_t *p_dec_obj = ( vlc_object_t * )vlc_object_find( p_object,
- VLC_OBJECT_DECODER,
- FIND_PARENT );
- if( p_dec_obj )
+ /* p_object is the vout, so the decoder is our parent and the
+ * postproc filter one of the decoder's children */
+ vlc_object_t *p_dec = (vlc_object_t *)
+ vlc_object_find( p_object, VLC_OBJECT_DECODER,
+ FIND_PARENT );
+ if( p_dec )
{
- vlc_object_t *p_object = p_dec_obj;
- PUSH_VAR( "ffmpeg-pp-q" );
- vlc_object_release( p_dec_obj );
+ vlc_object_t *p_pp = (vlc_object_t *)
+ vlc_object_find_name( p_dec, "postproc",
+ FIND_CHILD );
+ if( p_pp )
+ {
+ p_object = p_pp;
+ PUSH_VAR( "postproc-q" );
+ vlc_object_release( p_pp );
+ }
+
+ vlc_object_release( p_dec );
}
}
return VLC_SUCCESS;
@@ -510,7 +520,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) );
#endif
ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) );
- /* ACT_ADD( current, "ffmpeg-pp-q", qtr( "Decoder" ) ); */
+ ACT_ADD( current, "postproc-q", qtr( "Post processing" ) );
}
p_input = THEMIM->getInput();
@@ -1059,7 +1069,8 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
/* Check the type of the object variable */
if( !strcmp( psz_var, "audio-es" )
- || !strcmp( psz_var, "video-es" ) )
+ || !strcmp( psz_var, "video-es" )
+ || !strcmp( psz_var, "postproc-q" ) )
i_type = VLC_VAR_INTEGER | VLC_VAR_HASCHOICE;
else
i_type = var_Type( p_object, psz_var );
diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index a28986c..c619b7f 100644
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -90,6 +90,7 @@ static void ReleasePicture( picture_t *p_pic )
}
else
{
+ free( p_pic->p_q );
free( p_pic->p_data_orig );
free( p_pic );
}
diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 7290b60..6dc6232 100644
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -2269,6 +2269,7 @@ static void video_del_buffer( vlc_object_t *p_this, picture_t *p_pic )
VLC_UNUSED(p_this);
if( p_pic )
{
+ free( p_pic->p_q );
free( p_pic->p_data_orig );
free( p_pic->p_sys );
free( p_pic );
@@ -2280,6 +2281,7 @@ static void video_del_buffer_decoder( decoder_t *p_decoder, picture_t *p_pic )
VLC_UNUSED(p_decoder);
p_pic->i_refcount = 0;
p_pic->i_status = DESTROYED_PICTURE;
+ picture_CleanupQuant( p_pic );
}
static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
@@ -2287,6 +2289,7 @@ static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
VLC_UNUSED(p_filter);
p_pic->i_refcount = 0;
p_pic->i_status = DESTROYED_PICTURE;
+ picture_CleanupQuant( p_pic );
}
static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index e05d773..2e1237d 100644
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -102,6 +102,8 @@ struct filter_sys_t
pp_context_t *pp_context; /* Never changes after init */
pp_mode_t *pp_mode; /* Set to NULL if post processing is disabled */
+ bool b_had_matrix; /* Set to true if previous pic had a quant matrix (used to prevent spamming warning messages */
+
vlc_mutex_t lock; /* Lock when using or changing pp_mode */
};
@@ -139,6 +141,7 @@ static int OpenPostproc( vlc_object_t *p_this )
{
case VLC_FOURCC('I','4','4','4'):
case VLC_FOURCC('J','4','4','4'):
+ /* case VLC_FOURCC('Y','U','V','A'): FIXME Should work but alpha plane needs to be copied manually and I'm kind of feeling too lazy to write the code to do that ATM (i_pitch vs i_visible_pitch...). */
i_flags |= PP_FORMAT_444;
break;
case VLC_FOURCC('I','4','2','2'):
@@ -152,7 +155,6 @@ static int OpenPostproc( vlc_object_t *p_this )
case VLC_FOURCC('I','Y','U','V'):
case VLC_FOURCC('J','4','2','0'):
case VLC_FOURCC('Y','V','1','2'):
- /* case VLC_FOURCC('Y','U','V','A'): FIXME Should work but alpha plane needs to be copied manually and I'm kind of feeling too lazy to write the code to do that ATM (i_pitch vs i_visible_pitch...). */
i_flags |= PP_FORMAT_420;
break;
default:
@@ -238,6 +240,7 @@ static int OpenPostproc( vlc_object_t *p_this )
vlc_mutex_init( &p_sys->lock );
p_filter->pf_video_filter = PostprocPict;
+ p_sys->b_had_matrix = true;
return VLC_SUCCESS;
}
@@ -293,13 +296,22 @@ static picture_t *PostprocPict( filter_t *p_filter, picture_t *p_pic )
i_dst_stride[i_plane] = p_outpic->p[i_plane].i_pitch;
}
+ if( !p_pic->p_q && p_sys->b_had_matrix )
+ {
+ msg_Warn( p_filter, "Quantification table was not set by video decoder. Postprocessing won't look good." );
+ p_sys->b_had_matrix = false;
+ }
+ else if( p_pic->p_q )
+ {
+ p_sys->b_had_matrix = true;
+ }
+
pp_postprocess( src, i_src_stride, dst, i_dst_stride,
p_filter->fmt_in.video.i_width,
p_filter->fmt_in.video.i_height,
- NULL /* FIXME ? works by selecting a default table. But maybe setting our own might help improve post processing quality ... */,
- 0 /* FIXME */,
+ p_pic->p_q, p_pic->i_qstride,
p_sys->pp_mode, p_sys->pp_context,
- PP_PICT_TYPE_QP2 /* FIXME ? This should be set only for mpeg2 type codecs if I understand correctly. */ );
+ p_pic->i_qtype == QTYPE_MPEG2 ? PP_PICT_TYPE_QP2 : 0 );
vlc_mutex_unlock( &p_sys->lock );
return CopyInfoAndRelease( p_outpic, p_pic );
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 0e30948..4977ddd 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -712,6 +712,7 @@ static void VoutDisplayedPicture( vout_thread_t *p_vout, picture_t *p_pic )
else
{
p_pic->i_status = DESTROYED_PICTURE;
+ picture_CleanupQuant( p_pic );
p_vout->i_heap_size--;
}
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index b41aad2..a616d9c 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1327,6 +1327,7 @@ static void DropPicture( vout_thread_t *p_vout, picture_t *p_picture )
/* Destroy the picture without displaying it */
p_picture->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
+ picture_CleanupQuant( p_picture );
}
vlc_mutex_unlock( &p_vout->picture_lock );
}
diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 6c2e807..d90a3fb 100644
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -262,6 +262,7 @@ void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
p_pic->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
+ picture_CleanupQuant( p_pic );
vlc_mutex_unlock( &p_vout->picture_lock );
}
@@ -294,6 +295,7 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
p_pic->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
+ picture_CleanupQuant( p_pic );
}
vlc_mutex_unlock( &p_vout->picture_lock );
@@ -683,6 +685,10 @@ int __vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
p_pic->pf_unlock = 0;
p_pic->i_refcount = 0;
+ p_pic->p_q = NULL;
+ p_pic->i_qstride = 0;
+ p_pic->i_qtype = 0;
+
vout_InitFormat( &p_pic->format, i_chroma, i_width, i_height, i_aspect );
/* Make sure the real dimensions are a multiple of 16 */
@@ -1042,6 +1048,7 @@ void picture_Delete( picture_t *p_picture )
{
assert( p_picture && p_picture->i_refcount == 0 );
+ free( p_picture->p_q );
free( p_picture->p_data_orig );
free( p_picture->p_sys );
free( p_picture );
@@ -1094,4 +1101,3 @@ void plane_CopyPixels( plane_t *p_dst, const plane_t *p_src )
*
*****************************************************************************/
-
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 5 Dec 2008 01:52:50 -0000 1.8
+++ .cvsignore 16 Jan 2009 16:21:19 -0000 1.9
@@ -1 +1,2 @@
vlc-0.9.8a.tar.bz2
+vlc-0.9.9-git2009011313.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 5 Dec 2008 01:52:50 -0000 1.8
+++ sources 16 Jan 2009 16:21:19 -0000 1.9
@@ -1 +1,2 @@
8ffa2ff763badd5de7592004d8d69a63 vlc-0.9.8a.tar.bz2
+ec6fb4e74389d3ca6b80b6a607b02a3f vlc-0.9.9-git2009011313.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vlc.spec 15 Jan 2009 01:52:55 -0000 1.19
+++ vlc.spec 16 Jan 2009 16:21:19 -0000 1.20
@@ -5,7 +5,7 @@
%define live555_date 2008.07.25
%define vlc_git 0
%define vlc_date 20080915
-%define with_mozilla 0
+%define with_mozilla 1
%define with_dc1394 0
%define with_directfb 1
@@ -19,7 +19,7 @@
%else
Version: 0.9.8a
%define _version %{version}
-%define release_tag 2
+%define release_tag 3
%endif
Release: %{release_tag}%{?dist}
License: GPLv2+
@@ -39,10 +39,14 @@
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
Patch5: vlc-pulse0071.patch
+Patch6: 0001-Mozilla-SDK-libxul-1.9.1-preliminary-support.patch
+Patch7: 0002-Fix-the-config.h-reference-that-was-only-present-in.patch
+Patch8: vlc-backport-postproc_unif.patch
+Patch9: vlc-0.9.9-git2009011313.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
-%if 0
+%if 1
BuildRequires: gettext-devel
BuildRequires: libtool
%endif
@@ -271,9 +275,16 @@
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
%patch4 -p1 -b .mmx_pic
%patch5 -p1 -b .pulse0071
+%patch6 -p1 -b .libxul191
+%patch7 -p1 -b .config_h
+%patch8 -p1 -b .postproc
+%patch9 -p1 -b .vlc099
-chmod -x modules/gui/qt4/qt4*
+#chmod -x modules/gui/qt4/qt4*
#./bootstrap
+autoreconf
+libtoolize
+
%build
@@ -287,7 +298,7 @@
popd
%endif
-
+export MOZILLA_CFLAGS="$(pkg-config --cflags libxul) -DHAVE_NPFUNCTIONS_H"
%configure \
--disable-dependency-tracking \
--disable-rpath \
@@ -541,6 +552,11 @@
%changelog
+* Fri Jan 16 2009 kwizart < kwizart at gmail.com > - 0.9.8a-3
+- Add libxul 1.9.1 prelimary support
+- backport postproc fixes
+- Add pending 0.9-bugfix git branch
+
* Thu Jan 15 2009 kwizart < kwizart at gmail.com > - 0.9.8a-2
- Disable mozilla-vlc because of libxul 1.9.1 WIP
- Rebuild for libcdio
--- vlc-embeddedvideo.patch DELETED ---
15 years, 10 months
rpms/avbin/F-10 avbin-Makefile-shared.patch, NONE, 1.1 avbin-SAMPLE_FMT_S24.patch, NONE, 1.1 avbin-swscale.patch, NONE, 1.1 avbin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/avbin/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30791/F-10
Modified Files:
.cvsignore sources
Added Files:
avbin-Makefile-shared.patch avbin-SAMPLE_FMT_S24.patch
avbin-swscale.patch avbin.spec
Log Message:
* Thu Jan 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-6
- The S24 was actually needed for ffmpeg revision >= 15124. Updated the patch
* Thu Jan 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-5
- Fix license again
- Fix description length
- Patch for compilation against ffmpeg revision >= 16176
* Thu Dec 04 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-4
- Update the Makefile patch to do the linking in a proper way
- Preserve the timestamp of the Changelog
* Wed Dec 03 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-3
- Set the license to GPLv3 since we are linking to sws_scale which is from the
GPL part of ffmpeg.
* Sat Nov 22 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-2
- Patch to use ffmpeg's sws_scale() instead of the deprecated img_convert().
* Thu Oct 23 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-1
- Linked avbin to ffmpeg dynamically
- Use the release version 7 because the avbin code hasn't changed since in svn.
- Update the description
* Thu Oct 23 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-0.20081023svn.1
- Initial build. This is ffmpeg's SPEC file modified.
avbin-Makefile-shared.patch:
--- NEW FILE avbin-Makefile-shared.patch ---
diff -rupN avbin-src-7/Makefile avbin-src-7-new/Makefile
--- avbin-src-7/Makefile 2008-09-21 02:45:33.000000000 -0400
+++ avbin-src-7-new/Makefile 2008-11-22 20:32:48.000000000 -0500
@@ -1,7 +1,8 @@
# $Id: Makefile 18 2008-04-13 06:18:31Z Alex.Holkner $
CFLAGS += -DAVBIN_VERSION=$(AVBIN_VERSION) \
- -DFFMPEG_REVISION=$(FFMPEG_REVISION)
+ -DFFMPEG_REVISION=$(FFMPEG_REVISION) \
+ -fPIC $(RPM_OPT_FLAGS)
CC = gcc
LD = ld
@@ -13,7 +14,14 @@ OBJNAME = $(BUILDDIR)/avbin.o
INCLUDE_DIRS = -I include \
-I $(FFMPEG)
-include Makefile.$(PLATFORM)
+LINKNAME=libavbin.so
+SONAME=$(LINKNAME).$(AVBIN_VERSION)
+LIBNAME=$(OUTDIR)/$(SONAME)
+
+LDFLAGS += -shared -Wl,-soname=$(SONAME) -lavformat -lavcodec -lavutil -lswscale
+
+$(LIBNAME) : $(OBJNAME) $(OUTDIR)
+ $(CC) $(LDFLAGS) -o $@ $<
all : $(LIBNAME)
ln -sf $(LIBNAME) $(LINKNAME)
@@ -31,3 +39,10 @@ clean :
rm -f $(OBJNAME)
rm -f $(LINKNAME)
rm -f $(LIBNAME)
+
+install :
+ mkdir -p $(DESTDIR)/$(INCLUDEDIR)
+ mkdir -p $(DESTDIR)/$(LIBDIR)
+ install -pm 644 include/avbin.h $(DESTDIR)/$(INCLUDEDIR)
+ install -pm 755 dist/$(SONAME) $(DESTDIR)/$(LIBDIR)
+ ln -s $(SONAME) $(DESTDIR)/$(LIBDIR)/$(LINKNAME)
avbin-SAMPLE_FMT_S24.patch:
--- NEW FILE avbin-SAMPLE_FMT_S24.patch ---
diff -rupN avbin-src-7/src/avbin.c avbin-src-7-new/src/avbin.c
--- avbin-src-7/src/avbin.c 2009-01-15 13:49:29.000000000 -0500
+++ avbin-src-7-new/src/avbin.c 2009-01-15 13:50:20.000000000 -0500
@@ -216,10 +216,12 @@ int avbin_stream_info(AVbinFile *file, i
info->audio.sample_format = AVBIN_SAMPLE_FORMAT_S16;
info->audio.sample_bits = 16;
break;
+#if FFMPEG_REVISION < 15124
case SAMPLE_FMT_S24:
info->audio.sample_format = AVBIN_SAMPLE_FORMAT_S24;
info->audio.sample_bits = 24;
break;
+#endif
case SAMPLE_FMT_S32:
info->audio.sample_format = AVBIN_SAMPLE_FORMAT_S32;
info->audio.sample_bits = 32;
avbin-swscale.patch:
--- NEW FILE avbin-swscale.patch ---
diff -rupN avbin-src-7/src/avbin.c avbin-src-7-new/src/avbin.c
--- avbin-src-7/src/avbin.c 2008-09-21 02:45:33.000000000 -0400
+++ avbin-src-7-new/src/avbin.c 2008-11-22 20:32:48.000000000 -0500
@@ -28,6 +28,7 @@
#include <libavformat/avformat.h>
#include <libavcodec/avcodec.h>
#include <libavutil/avutil.h>
+#include <libswscale/swscale.h>
struct _AVbinFile {
AVFormatContext *context;
@@ -334,13 +335,27 @@ int avbin_decode_video(AVbinStream *stre
avpicture_fill(&picture_rgb, data_out, PIX_FMT_RGB24, width, height);
- /* img_convert is marked deprecated in favour of swscale, don't
- * be surprised if this stops working the next time the ffmpeg version
- * is pushed. Example use of the new API is in ffplay.c. */
- img_convert(&picture_rgb, PIX_FMT_RGB24,
- (AVPicture *) stream->frame, stream->codec_context->pix_fmt,
- width, height);
+ static int sws_flags = SWS_BICUBIC;
+ static struct SwsContext *img_convert_ctx;
+ img_convert_ctx = sws_getContext( width,
+ height,
+ stream->codec_context->pix_fmt,
+ width,
+ height,
+ PIX_FMT_RGB24,
+ sws_flags, NULL, NULL, NULL);
+
+ sws_scale( img_convert_ctx,
+ stream->frame->data,
+ stream->frame->linesize,
+ 0,
+ height,
+ picture_rgb.data,
+ picture_rgb.linesize);
+
+ sws_freeContext(img_convert_ctx);
+
return used;
}
--- NEW FILE avbin.spec ---
Summary: Cross-platform media decoding library
Name: avbin
Version: 7
Release: 6%{?dist}
# Note that this license is implicitly converted to GPLv3 because we are linking to
# a GPLv2+ ffmpeg:
License: LGPLv3+
Group: System Environment/Libraries
URL: http://code.google.com/p/avbin/
Source0: http://avbin.googlecode.com/files/%{name}-src-%{version}.tar.gz
# avbin is patched to use sws_scale() instead of the obsolete img_convert().
# Patch sent upstream:
# http://code.google.com/p/avbin/issues/detail?id=8
Patch0: avbin-swscale.patch
# SAMPLE_FMT_S24 is deprecated on ffmpeg rev > 16176:
Patch1: avbin-SAMPLE_FMT_S24.patch
# The original Makefile links ffmpeg statically. This is the modified
# Makefile that tells the compiler to link dynamically to ffmpeg:
Patch9: avbin-Makefile-shared.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen
BuildRequires: ffmpeg >= 0.4.9-0.48.20080908
BuildRequires: ffmpeg-devel >= 0.4.9-0.48.20080908
%description
AVbin is a thin wrapper around FFmpeg, providing binary compatibility for
applications and languages that need it. AVbin allows programs that require
dynamic linkage to use FFmpeg. It does this by providing
* an accurate version number within the shared library, allowing applications
to select the appropriate data structures and functions to use at runtime,
* a simplified interface with an unchanging ABI to the most common decoding
functionality within FFmpeg.
%package devel
Summary: Development package for AVbin
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
AVbin is a thin wrapper around FFmpeg, providing binary compatibility for
applications and languages that need it. This package provides the header
and the documentation files for AVbin.
%prep
%setup -q -n %{name}-src-%{version}
%patch0 -p1
%patch1 -p1
%patch9 -p1
# Fix permissions and end of line encoding issues:
sed 's/\r//' CHANGELOG > CHANGELOG.bak
touch -r CHANGELOG CHANGELOG.bak
mv -f CHANGELOG.bak CHANGELOG
%build
# Now compile avbin
make %{?_smp_mflags} \
AVBIN_VERSION=$(cat VERSION) \
FFMPEG_REVISION=$(ffmpeg -version |grep FFmpeg |sed 's|[^0-9]*||') \
FFMPEG=%{_includedir}/ffmpeg
# Generate the doc files:
doxygen Doxyfile
%install
rm -rf $RPM_BUILD_ROOT
make install AVBIN_VERSION=$(cat VERSION) \
INCLUDEDIR=%{_includedir} \
LIBDIR=%{_libdir} \
DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING.LESSER CHANGELOG README
%{_libdir}/lib%{name}.so.%{version}
%files devel
%defattr(-,root,root,-)
%doc doc/html/* COPYING.LESSER
%{_includedir}/*
%{_libdir}/lib%{name}.so
%changelog
* Thu Jan 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-6
- The S24 was actually needed for ffmpeg revision >= 15124. Updated the patch
* Thu Jan 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-5
- Fix license again
- Fix description length
- Patch for compilation against ffmpeg revision >= 16176
* Thu Dec 04 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-4
- Update the Makefile patch to do the linking in a proper way
- Preserve the timestamp of the Changelog
* Wed Dec 03 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-3
- Set the license to GPLv3 since we are linking to sws_scale which is from the
GPL part of ffmpeg.
* Sat Nov 22 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-2
- Patch to use ffmpeg's sws_scale() instead of the deprecated img_convert().
* Thu Oct 23 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-1
- Linked avbin to ffmpeg dynamically
- Use the release version 7 because the avbin code hasn't changed since in svn.
- Update the description
* Thu Oct 23 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-0.20081023svn.1
- Initial build. This is ffmpeg's SPEC file modified.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avbin/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 16 Jan 2009 14:27:05 -0000 1.1
+++ .cvsignore 16 Jan 2009 14:37:41 -0000 1.2
@@ -0,0 +1 @@
+avbin-src-7.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avbin/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 16 Jan 2009 14:27:05 -0000 1.1
+++ sources 16 Jan 2009 14:37:41 -0000 1.2
@@ -0,0 +1 @@
+9c08f4f6e778021dcd154e11fd0f79ad avbin-src-7.tar.gz
15 years, 10 months
rpms/avbin/devel avbin-Makefile-shared.patch, NONE, 1.1 avbin-SAMPLE_FMT_S24.patch, NONE, 1.1 avbin-swscale.patch, NONE, 1.1 avbin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/avbin/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30290/devel
Modified Files:
.cvsignore sources
Added Files:
avbin-Makefile-shared.patch avbin-SAMPLE_FMT_S24.patch
avbin-swscale.patch avbin.spec
Log Message:
* Thu Jan 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-6
- The S24 was actually needed for ffmpeg revision >= 15124. Updated the patch
* Thu Jan 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-5
- Fix license again
- Fix description length
- Patch for compilation against ffmpeg revision >= 16176
* Thu Dec 04 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-4
- Update the Makefile patch to do the linking in a proper way
- Preserve the timestamp of the Changelog
* Wed Dec 03 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-3
- Set the license to GPLv3 since we are linking to sws_scale which is from the
GPL part of ffmpeg.
* Sat Nov 22 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-2
- Patch to use ffmpeg's sws_scale() instead of the deprecated img_convert().
* Thu Oct 23 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-1
- Linked avbin to ffmpeg dynamically
- Use the release version 7 because the avbin code hasn't changed since in svn.
- Update the description
* Thu Oct 23 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-0.20081023svn.1
- Initial build. This is ffmpeg's SPEC file modified.
avbin-Makefile-shared.patch:
--- NEW FILE avbin-Makefile-shared.patch ---
diff -rupN avbin-src-7/Makefile avbin-src-7-new/Makefile
--- avbin-src-7/Makefile 2008-09-21 02:45:33.000000000 -0400
+++ avbin-src-7-new/Makefile 2008-11-22 20:32:48.000000000 -0500
@@ -1,7 +1,8 @@
# $Id: Makefile 18 2008-04-13 06:18:31Z Alex.Holkner $
CFLAGS += -DAVBIN_VERSION=$(AVBIN_VERSION) \
- -DFFMPEG_REVISION=$(FFMPEG_REVISION)
+ -DFFMPEG_REVISION=$(FFMPEG_REVISION) \
+ -fPIC $(RPM_OPT_FLAGS)
CC = gcc
LD = ld
@@ -13,7 +14,14 @@ OBJNAME = $(BUILDDIR)/avbin.o
INCLUDE_DIRS = -I include \
-I $(FFMPEG)
-include Makefile.$(PLATFORM)
+LINKNAME=libavbin.so
+SONAME=$(LINKNAME).$(AVBIN_VERSION)
+LIBNAME=$(OUTDIR)/$(SONAME)
+
+LDFLAGS += -shared -Wl,-soname=$(SONAME) -lavformat -lavcodec -lavutil -lswscale
+
+$(LIBNAME) : $(OBJNAME) $(OUTDIR)
+ $(CC) $(LDFLAGS) -o $@ $<
all : $(LIBNAME)
ln -sf $(LIBNAME) $(LINKNAME)
@@ -31,3 +39,10 @@ clean :
rm -f $(OBJNAME)
rm -f $(LINKNAME)
rm -f $(LIBNAME)
+
+install :
+ mkdir -p $(DESTDIR)/$(INCLUDEDIR)
+ mkdir -p $(DESTDIR)/$(LIBDIR)
+ install -pm 644 include/avbin.h $(DESTDIR)/$(INCLUDEDIR)
+ install -pm 755 dist/$(SONAME) $(DESTDIR)/$(LIBDIR)
+ ln -s $(SONAME) $(DESTDIR)/$(LIBDIR)/$(LINKNAME)
avbin-SAMPLE_FMT_S24.patch:
--- NEW FILE avbin-SAMPLE_FMT_S24.patch ---
diff -rupN avbin-src-7/src/avbin.c avbin-src-7-new/src/avbin.c
--- avbin-src-7/src/avbin.c 2009-01-15 13:49:29.000000000 -0500
+++ avbin-src-7-new/src/avbin.c 2009-01-15 13:50:20.000000000 -0500
@@ -216,10 +216,12 @@ int avbin_stream_info(AVbinFile *file, i
info->audio.sample_format = AVBIN_SAMPLE_FORMAT_S16;
info->audio.sample_bits = 16;
break;
+#if FFMPEG_REVISION < 15124
case SAMPLE_FMT_S24:
info->audio.sample_format = AVBIN_SAMPLE_FORMAT_S24;
info->audio.sample_bits = 24;
break;
+#endif
case SAMPLE_FMT_S32:
info->audio.sample_format = AVBIN_SAMPLE_FORMAT_S32;
info->audio.sample_bits = 32;
avbin-swscale.patch:
--- NEW FILE avbin-swscale.patch ---
diff -rupN avbin-src-7/src/avbin.c avbin-src-7-new/src/avbin.c
--- avbin-src-7/src/avbin.c 2008-09-21 02:45:33.000000000 -0400
+++ avbin-src-7-new/src/avbin.c 2008-11-22 20:32:48.000000000 -0500
@@ -28,6 +28,7 @@
#include <libavformat/avformat.h>
#include <libavcodec/avcodec.h>
#include <libavutil/avutil.h>
+#include <libswscale/swscale.h>
struct _AVbinFile {
AVFormatContext *context;
@@ -334,13 +335,27 @@ int avbin_decode_video(AVbinStream *stre
avpicture_fill(&picture_rgb, data_out, PIX_FMT_RGB24, width, height);
- /* img_convert is marked deprecated in favour of swscale, don't
- * be surprised if this stops working the next time the ffmpeg version
- * is pushed. Example use of the new API is in ffplay.c. */
- img_convert(&picture_rgb, PIX_FMT_RGB24,
- (AVPicture *) stream->frame, stream->codec_context->pix_fmt,
- width, height);
+ static int sws_flags = SWS_BICUBIC;
+ static struct SwsContext *img_convert_ctx;
+ img_convert_ctx = sws_getContext( width,
+ height,
+ stream->codec_context->pix_fmt,
+ width,
+ height,
+ PIX_FMT_RGB24,
+ sws_flags, NULL, NULL, NULL);
+
+ sws_scale( img_convert_ctx,
+ stream->frame->data,
+ stream->frame->linesize,
+ 0,
+ height,
+ picture_rgb.data,
+ picture_rgb.linesize);
+
+ sws_freeContext(img_convert_ctx);
+
return used;
}
--- NEW FILE avbin.spec ---
Summary: Cross-platform media decoding library
Name: avbin
Version: 7
Release: 6%{?dist}
# Note that this license is implicitly converted to GPLv3 because we are linking to
# a GPLv2+ ffmpeg:
License: LGPLv3+
Group: System Environment/Libraries
URL: http://code.google.com/p/avbin/
Source0: http://avbin.googlecode.com/files/%{name}-src-%{version}.tar.gz
# avbin is patched to use sws_scale() instead of the obsolete img_convert().
# Patch sent upstream:
# http://code.google.com/p/avbin/issues/detail?id=8
Patch0: avbin-swscale.patch
# SAMPLE_FMT_S24 is deprecated on ffmpeg rev > 16176:
Patch1: avbin-SAMPLE_FMT_S24.patch
# The original Makefile links ffmpeg statically. This is the modified
# Makefile that tells the compiler to link dynamically to ffmpeg:
Patch9: avbin-Makefile-shared.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen
BuildRequires: ffmpeg >= 0.4.9-0.48.20080908
BuildRequires: ffmpeg-devel >= 0.4.9-0.48.20080908
%description
AVbin is a thin wrapper around FFmpeg, providing binary compatibility for
applications and languages that need it. AVbin allows programs that require
dynamic linkage to use FFmpeg. It does this by providing
* an accurate version number within the shared library, allowing applications
to select the appropriate data structures and functions to use at runtime,
* a simplified interface with an unchanging ABI to the most common decoding
functionality within FFmpeg.
%package devel
Summary: Development package for AVbin
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
AVbin is a thin wrapper around FFmpeg, providing binary compatibility for
applications and languages that need it. This package provides the header
and the documentation files for AVbin.
%prep
%setup -q -n %{name}-src-%{version}
%patch0 -p1
%patch1 -p1
%patch9 -p1
# Fix permissions and end of line encoding issues:
sed 's/\r//' CHANGELOG > CHANGELOG.bak
touch -r CHANGELOG CHANGELOG.bak
mv -f CHANGELOG.bak CHANGELOG
%build
# Now compile avbin
make %{?_smp_mflags} \
AVBIN_VERSION=$(cat VERSION) \
FFMPEG_REVISION=$(ffmpeg -version |grep FFmpeg |sed 's|[^0-9]*||') \
FFMPEG=%{_includedir}/ffmpeg
# Generate the doc files:
doxygen Doxyfile
%install
rm -rf $RPM_BUILD_ROOT
make install AVBIN_VERSION=$(cat VERSION) \
INCLUDEDIR=%{_includedir} \
LIBDIR=%{_libdir} \
DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING.LESSER CHANGELOG README
%{_libdir}/lib%{name}.so.%{version}
%files devel
%defattr(-,root,root,-)
%doc doc/html/* COPYING.LESSER
%{_includedir}/*
%{_libdir}/lib%{name}.so
%changelog
* Thu Jan 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-6
- The S24 was actually needed for ffmpeg revision >= 15124. Updated the patch
* Thu Jan 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-5
- Fix license again
- Fix description length
- Patch for compilation against ffmpeg revision >= 16176
* Thu Dec 04 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-4
- Update the Makefile patch to do the linking in a proper way
- Preserve the timestamp of the Changelog
* Wed Dec 03 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-3
- Set the license to GPLv3 since we are linking to sws_scale which is from the
GPL part of ffmpeg.
* Sat Nov 22 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-2
- Patch to use ffmpeg's sws_scale() instead of the deprecated img_convert().
* Thu Oct 23 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-1
- Linked avbin to ffmpeg dynamically
- Use the release version 7 because the avbin code hasn't changed since in svn.
- Update the description
* Thu Oct 23 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-0.20081023svn.1
- Initial build. This is ffmpeg's SPEC file modified.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avbin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 16 Jan 2009 14:27:05 -0000 1.1
+++ .cvsignore 16 Jan 2009 14:35:32 -0000 1.2
@@ -0,0 +1 @@
+avbin-src-7.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avbin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 16 Jan 2009 14:27:05 -0000 1.1
+++ sources 16 Jan 2009 14:35:32 -0000 1.2
@@ -0,0 +1 @@
+9c08f4f6e778021dcd154e11fd0f79ad avbin-src-7.tar.gz
15 years, 10 months
rpms/avbin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/avbin/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsE29732/rpms/avbin/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module avbin
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: avbin
# $Id: Makefile,v 1.1 2009/01/16 14:27:05 thl Exp $
NAME := avbin
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
15 years, 10 months
rpms/avbin Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/avbin
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsE29732/rpms/avbin
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module avbin
--- NEW FILE Makefile ---
# Top level Makefile for module avbin
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
15 years, 10 months
rpms/avbin/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/avbin/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsE29732/rpms/avbin/devel
Log Message:
Directory /cvs/free/rpms/avbin/devel added to the repository
15 years, 10 months
rpms/avbin - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/avbin
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsE29732/rpms/avbin
Log Message:
Directory /cvs/free/rpms/avbin added to the repository
15 years, 10 months
rpms/sdlmame/F-9 sdlmame-0129u1-ppc.patch,NONE,1.1
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18804
Added Files:
sdlmame-0129u1-ppc.patch
Log Message:
Fixed the ppc build
sdlmame-0129u1-ppc.patch:
--- NEW FILE sdlmame-0129u1-ppc.patch ---
--- src/emu/cpu/i860/i860dec.c~ 2009-01-15 15:29:11.000000000 +0100
+++ src/emu/cpu/i860/i860dec.c 2009-01-16 11:55:47.000000000 +0100
@@ -42,7 +42,7 @@
#include <math.h>
-#ifdef LSB_FIRST
+#if 1
#undef HOST_MSB
#else
#define HOST_MSB
15 years, 10 months
rpms/sdlmame/F-10 sdlmame-0129u1-ppc.patch,NONE,1.1
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18711
Added Files:
sdlmame-0129u1-ppc.patch
Log Message:
Fixed the ppc build
sdlmame-0129u1-ppc.patch:
--- NEW FILE sdlmame-0129u1-ppc.patch ---
--- src/emu/cpu/i860/i860dec.c~ 2009-01-15 15:29:11.000000000 +0100
+++ src/emu/cpu/i860/i860dec.c 2009-01-16 11:55:47.000000000 +0100
@@ -42,7 +42,7 @@
#include <math.h>
-#ifdef LSB_FIRST
+#if 1
#undef HOST_MSB
#else
#define HOST_MSB
15 years, 10 months
