rpms/gstreamer-plugins-ugly/devel gstreamer-plugins-ugly.spec, 1.29, 1.30
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gstreamer-plugins-ugly/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15202
Modified Files:
gstreamer-plugins-ugly.spec
Log Message:
Rebuilt
Index: gstreamer-plugins-ugly.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-ugly/devel/gstreamer-plugins-ugly.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gstreamer-plugins-ugly.spec 31 Jan 2011 16:56:35 -0000 1.29
+++ gstreamer-plugins-ugly.spec 11 Mar 2011 08:44:13 -0000 1.30
@@ -11,7 +11,7 @@
Summary: GStreamer streaming media framework "ugly" plug-ins
Name: gstreamer-plugins-ugly
Version: 0.10.17
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -133,6 +133,9 @@
%changelog
+* Fri Mar 11 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.17-2
+- Rebuilt for new x264/FFmpeg
+
* Fri Jan 28 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.10.17-1
- New upstream release 0.10.17
- Temporarily boost mp3parse element rank so that it gets prefered
13 years, 1 month
rpms/libquicktime/devel libquicktime.spec,1.20,1.21
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12085
Modified Files:
libquicktime.spec
Log Message:
Rebuilt
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libquicktime.spec 21 Jan 2011 18:46:18 -0000 1.20
+++ libquicktime.spec 11 Mar 2011 08:17:21 -0000 1.21
@@ -1,7 +1,7 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
@@ -129,6 +129,9 @@
# --------------------------------------------------------------------
%changelog
+* Fri Mar 11 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.2-2
+- Rebuilt for new x264/FFmpeg
+
* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.2-1
- Update to 1.2.2
- Add %%{_bindir}/lqtremux
13 years, 1 month
rpms/vlc/devel vlc.spec,1.115,1.116
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11593
Modified Files:
vlc.spec
Log Message:
Rebuilt
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- vlc.spec 8 Mar 2011 22:21:13 -0000 1.115
+++ vlc.spec 11 Mar 2011 08:16:36 -0000 1.116
@@ -28,7 +28,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 1.1.8
-Release: 0.1%{?dist}.1
+Release: 0.2%{?dist}.1
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -557,6 +557,9 @@
%changelog
+* Fri Mar 11 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.8-0.2.1
+- Rebuilt for new x264/FFmpeg
+
* Mon Mar 07 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.8-0.1.1
- Update to pre-1.1.8 bugfix git from today
13 years, 1 month
rpms/x264/devel x264-shared.patch,1.4,1.5 x264.spec,1.24,1.25
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15380
Modified Files:
x264.spec
Added Files:
x264-shared.patch
Log Message:
Revert last commit. The removed patch is not merged upstream and has nothing
to do with the SONAME.
x264-shared.patch:
Makefile | 5 ++++-
configure | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
Index: x264-shared.patch
===================================================================
RCS file: x264-shared.patch
diff -N x264-shared.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x264-shared.patch 10 Mar 2011 22:34:46 -0000 1.5
@@ -0,0 +1,34 @@
+diff -up x264-20101211/configure.shared x264-20101211/configure
+--- x264-20101211/configure.shared 2010-12-11 19:47:37.000000000 +0100
++++ x264-20101211/configure 2010-12-11 19:48:05.000000000 +0100
+@@ -796,7 +796,7 @@ if [ "$shared" = "yes" ]; then
+ echo "SONAME=libx264.so.$API" >> config.mak
+ echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
+ fi
+- echo 'default: $(SONAME)' >> config.mak
++ echo 'default: libx264.a $(SONAME)' >> config.mak
+ fi
+
+ cat version.h >> config.h
+diff -up x264-20101211/Makefile.shared x264-20101211/Makefile
+--- x264-20101211/Makefile.shared 2010-12-11 19:46:33.000000000 +0100
++++ x264-20101211/Makefile 2010-12-11 19:47:37.000000000 +0100
+@@ -124,6 +124,9 @@ ifneq ($(SONAME),)
+ ifeq ($(SYS),MINGW)
+ SRCSO += x264dll.c
+ endif
++LIB=$(SONAME)
++else
++LIB=libx264.a
+ endif
+
+ OBJS = $(SRCS:%.c=%.o)
+@@ -142,7 +145,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
+ $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
+ $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+
+-x264$(EXE): $(OBJCLI) libx264.a
++x264$(EXE): $(OBJCLI) $(LIB)
+ $(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
+
+ checkasm: tools/checkasm.o libx264.a
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- x264.spec 10 Mar 2011 21:55:23 -0000 1.24
+++ x264.spec 10 Mar 2011 22:34:46 -0000 1.25
@@ -3,7 +3,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.30.%{snapshot}%{?dist}
+Release: 0.29.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -11,6 +11,8 @@
Source1: x264-snapshot.sh
# don't remove config.h and don't re-run version.sh
Patch0: x264-nover.patch
+# link with shared libx264
+Patch1: x264-shared.patch
# don't strip if configured with --enable-debug
Patch2: x264-nostrip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
@@ -63,6 +65,7 @@
%prep
%setup -q -n %{name}-%{snapshot}
%patch0 -p1 -b .nover
+%patch1 -p1 -b .shared
%patch2 -p1 -b .nostrip
# AUTHORS file is in iso-8859-1
iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
@@ -134,9 +137,6 @@
%endif
%changelog
-* Thu Mar 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0-0.30.20110227
-- Remove merged x264-shared.patch
-
* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110227
- 20110227 snapshot (ABI bump)
13 years, 1 month
rpms/x264/devel x264.spec,1.23,1.24 x264-shared.patch,1.3,NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9851
Modified Files:
x264.spec
Removed Files:
x264-shared.patch
Log Message:
Remove merged patch
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- x264.spec 27 Feb 2011 22:52:17 -0000 1.23
+++ x264.spec 10 Mar 2011 21:55:23 -0000 1.24
@@ -3,7 +3,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.29.%{snapshot}%{?dist}
+Release: 0.30.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -11,8 +11,6 @@
Source1: x264-snapshot.sh
# don't remove config.h and don't re-run version.sh
Patch0: x264-nover.patch
-# link with shared libx264
-Patch1: x264-shared.patch
# don't strip if configured with --enable-debug
Patch2: x264-nostrip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
@@ -65,7 +63,6 @@
%prep
%setup -q -n %{name}-%{snapshot}
%patch0 -p1 -b .nover
-%patch1 -p1 -b .shared
%patch2 -p1 -b .nostrip
# AUTHORS file is in iso-8859-1
iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
@@ -137,6 +134,9 @@
%endif
%changelog
+* Thu Mar 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0-0.30.20110227
+- Remove merged x264-shared.patch
+
* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110227
- 20110227 snapshot (ABI bump)
--- x264-shared.patch DELETED ---
13 years, 1 month
rpms/x264/devel x264-shared.patch,1.2,1.3
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6949
Modified Files:
x264-shared.patch
Log Message:
- push forgotten rebased patch
x264-shared.patch:
Makefile | 5 ++++-
configure | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
Index: x264-shared.patch
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-shared.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x264-shared.patch 19 Jun 2010 22:17:30 -0000 1.2
+++ x264-shared.patch 10 Mar 2011 21:43:29 -0000 1.3
@@ -1,7 +1,7 @@
-diff -up x264-20100620/configure.shared x264-20100620/configure
---- x264-20100620/configure.shared 2010-06-20 00:13:02.000000000 +0200
-+++ x264-20100620/configure 2010-06-20 00:13:31.000000000 +0200
-@@ -686,7 +686,7 @@ if [ "$shared" = "yes" ]; then
+diff -up x264-20101211/configure.shared x264-20101211/configure
+--- x264-20101211/configure.shared 2010-12-11 19:47:37.000000000 +0100
++++ x264-20101211/configure 2010-12-11 19:48:05.000000000 +0100
+@@ -796,7 +796,7 @@ if [ "$shared" = "yes" ]; then
echo "SONAME=libx264.so.$API" >> config.mak
echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
fi
@@ -10,10 +10,10 @@
fi
cat version.h >> config.h
-diff -up x264-20100620/Makefile.shared x264-20100620/Makefile
---- x264-20100620/Makefile.shared 2010-06-20 00:12:43.000000000 +0200
-+++ x264-20100620/Makefile 2010-06-20 00:13:02.000000000 +0200
-@@ -109,6 +109,9 @@ ifneq ($(SONAME),)
+diff -up x264-20101211/Makefile.shared x264-20101211/Makefile
+--- x264-20101211/Makefile.shared 2010-12-11 19:46:33.000000000 +0100
++++ x264-20101211/Makefile 2010-12-11 19:47:37.000000000 +0100
+@@ -124,6 +124,9 @@ ifneq ($(SONAME),)
ifeq ($(SYS),MINGW)
SRCSO += x264dll.c
endif
@@ -23,12 +23,12 @@
endif
OBJS = $(SRCS:%.c=%.o)
-@@ -127,7 +130,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
+@@ -142,7 +145,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
$(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
-x264$(EXE): $(OBJCLI) libx264.a
+x264$(EXE): $(OBJCLI) $(LIB)
- $(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI)
+ $(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
checkasm: tools/checkasm.o libx264.a
13 years, 1 month
rpms/gpac/devel gpac.spec,1.24,1.25
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1182
Modified Files:
gpac.spec
Log Message:
Disable openjpeg
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gpac.spec 10 Mar 2011 16:02:55 -0000 1.24
+++ gpac.spec 10 Mar 2011 16:42:35 -0000 1.25
@@ -51,7 +51,7 @@
BuildRequires: js-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
-BuildRequires: openjpeg-devel
+#BuildRequires: openjpeg-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: zlib-devel
BuildRequires: libogg-devel libvorbis-devel libtheora-devel
13 years, 1 month
rpms/libva-freeworld/devel libva-1.0.10-20110310.patch,NONE,1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libva-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31246
Added Files:
libva-1.0.10-20110310.patch
Log Message:
And the said patch
libva-1.0.10-20110310.patch:
gen6_mfd.c | 7
i965_avc_bsd.c | 7
i965_defines.h | 7
i965_drv_video.c | 352 +++
i965_drv_video.h | 8
i965_post_processing.c | 930 +++++++---
i965_post_processing.h | 5
i965_render.c | 28
i965_structs.h | 63
shaders/post_processing/Common/Multiple_Loop.asm | 2
shaders/post_processing/Core_Kernels/PL2_AVS_IEF_Unpack_16x8.asm | 64
shaders/post_processing/Makefile.am | 27
shaders/post_processing/null.g6a | 3
shaders/post_processing/null.g6b | 1
shaders/post_processing/nv12_avs_nv12.g4b.gen5 | 68
shaders/post_processing/nv12_avs_nv12.g6b | 235 ++
shaders/post_processing/nv12_dndi_nv12.g4b.gen5 | 2
shaders/post_processing/nv12_dndi_nv12.g6b | 159 +
shaders/post_processing/nv12_load_save_nv12.g4b.gen5 | 4
shaders/post_processing/nv12_load_save_nv12.g6b | 179 +
shaders/post_processing/nv12_scaling_nv12.g4b.gen5 | 4
shaders/post_processing/nv12_scaling_nv12.g6b | 295 +++
22 files changed, 2080 insertions(+), 370 deletions(-)
--- NEW FILE libva-1.0.10-20110310.patch ---
diff --git a/i965_drv_video/gen6_mfd.c b/i965_drv_video/gen6_mfd.c
index 0265687..3b178c2 100644
--- a/i965_drv_video/gen6_mfd.c
+++ b/i965_drv_video/gen6_mfd.c
@@ -85,10 +85,10 @@ gen6_mfd_avc_frame_store_index(VADriverContextP ctx, VAPictureParameterBufferH26
struct object_surface *obj_surface = SURFACE(gen6_mfd_context->reference_surface[i].surface_id);
obj_surface->flags &= ~SURFACE_REFERENCED;
- if (obj_surface->flags & SURFACE_DISPLAYED) {
+ if ((obj_surface->flags & SURFACE_ALL_MASK) == SURFACE_DISPLAYED) {
dri_bo_unreference(obj_surface->bo);
obj_surface->bo = NULL;
- obj_surface->flags = 0;
+ obj_surface->flags &= ~SURFACE_REF_DIS_MASK;
}
if (obj_surface->free_private_data)
@@ -1039,7 +1039,8 @@ gen6_mfd_avc_decode_init(VADriverContextP ctx, struct decode_state *decode_state
assert(!(va_pic->flags & VA_PICTURE_H264_INVALID));
obj_surface = SURFACE(va_pic->picture_id);
assert(obj_surface);
- obj_surface->flags = (pic_param->pic_fields.bits.reference_pic_flag ? SURFACE_REFERENCED : 0);
+ obj_surface->flags &= ~SURFACE_REF_DIS_MASK;
+ obj_surface->flags |= (pic_param->pic_fields.bits.reference_pic_flag ? SURFACE_REFERENCED : 0);
gen6_mfd_init_avc_surface(ctx, pic_param, obj_surface);
if (obj_surface->bo == NULL) {
diff --git a/i965_drv_video/i965_avc_bsd.c b/i965_drv_video/i965_avc_bsd.c
index 0976439..89bd169 100644
--- a/i965_drv_video/i965_avc_bsd.c
+++ b/i965_drv_video/i965_avc_bsd.c
@@ -507,7 +507,8 @@ i965_avc_bsd_buf_base_state(VADriverContextP ctx,
assert(!(va_pic->flags & VA_PICTURE_H264_INVALID));
obj_surface = SURFACE(va_pic->picture_id);
assert(obj_surface);
- obj_surface->flags = (pic_param->pic_fields.bits.reference_pic_flag ? SURFACE_REFERENCED : 0);
+ obj_surface->flags &= ~SURFACE_REF_DIS_MASK;
+ obj_surface->flags |= (pic_param->pic_fields.bits.reference_pic_flag ? SURFACE_REFERENCED : 0);
i965_avc_bsd_init_avc_bsd_surface(ctx, obj_surface, pic_param);
avc_bsd_surface = obj_surface->private_data;
@@ -922,10 +923,10 @@ i965_avc_bsd_frame_store_index(VADriverContextP ctx,
struct object_surface *obj_surface = SURFACE(i965_h264_context->fsid_list[i].surface_id);
obj_surface->flags &= ~SURFACE_REFERENCED;
- if (obj_surface->flags & SURFACE_DISPLAYED) {
+ if ((obj_surface->flags & SURFACE_ALL_MASK) == SURFACE_DISPLAYED) {
dri_bo_unreference(obj_surface->bo);
obj_surface->bo = NULL;
- obj_surface->flags = 0;
+ obj_surface->flags &= ~SURFACE_REF_DIS_MASK;
}
if (obj_surface->free_private_data)
diff --git a/i965_drv_video/i965_defines.h b/i965_drv_video/i965_defines.h
index b03dc00..3285b79 100644
--- a/i965_drv_video/i965_defines.h
+++ b/i965_drv_video/i965_defines.h
@@ -27,6 +27,13 @@
#define CMD_BSD_IND_OBJ_BASE_ADDR CMD(2, 4, 4)
#define CMD_AVC_BSD_OBJECT CMD(2, 4, 8)
+#define CMD_MEDIA_VFE_STATE CMD(2, 0, 0)
+#define CMD_MEDIA_CURBE_LOAD CMD(2, 0, 1)
+#define CMD_MEDIA_INTERFACE_DESCRIPTOR_LOAD CMD(2, 0, 2)
+#define CMD_MEDIA_GATEWAY_STATE CMD(2, 0, 3)
+#define CMD_MEDIA_STATE_FLUSH CMD(2, 0, 4)
+#define CMD_MEDIA_OBJECT_WALKER CMD(2, 1, 3)
+
#define CMD_PIPELINED_POINTERS CMD(3, 0, 0)
#define CMD_BINDING_TABLE_POINTERS CMD(3, 0, 1)
# define GEN6_BINDING_TABLE_MODIFY_PS (1 << 12)/* for GEN6 */
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 303e090..2fc2378 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -49,13 +49,17 @@
#define IMAGE_ID_OFFSET 0x0a000000
#define SUBPIC_ID_OFFSET 0x10000000
-#define HAS_VC1(ctx) (IS_GEN6((ctx)->intel.device_id))
+#define HAS_MPEG2(ctx) (IS_G4X((ctx)->intel.device_id) || \
+ IS_IRONLAKE((ctx)->intel.device_id) || \
+ (IS_GEN6((ctx)->intel.device_id) && (ctx)->intel.has_bsd))
-/* Defined to 1 if GPU supports H.264 decoding */
-/* XXX: drop IS_IRONLAKE(ctx) check once G4X support is available */
-#define HAS_H264(ctx) (IS_GEN6((ctx)->intel.device_id) || \
- (IS_IRONLAKE((ctx)->intel.device_id) && \
- (ctx)->intel.has_bsd))
+#define HAS_H264(ctx) ((IS_GEN6((ctx)->intel.device_id) || \
+ IS_IRONLAKE((ctx)->intel.device_id)) && \
+ (ctx)->intel.has_bsd)
+
+#define HAS_VC1(ctx) (IS_GEN6((ctx)->intel.device_id) && (ctx)->intel.has_bsd)
+
+#define HAS_TILED_SURFACE(ctx) (IS_GEN6((ctx)->intel.device_id))
enum {
I965_SURFACETYPE_RGBA = 1,
@@ -131,8 +135,10 @@ i965_QueryConfigProfiles(VADriverContextP ctx,
struct i965_driver_data * const i965 = i965_driver_data(ctx);
int i = 0;
- profile_list[i++] = VAProfileMPEG2Simple;
- profile_list[i++] = VAProfileMPEG2Main;
+ if (HAS_MPEG2(i965)) {
+ profile_list[i++] = VAProfileMPEG2Simple;
+ profile_list[i++] = VAProfileMPEG2Main;
+ }
if (HAS_H264(i965)) {
profile_list[i++] = VAProfileH264Baseline;
@@ -165,7 +171,8 @@ i965_QueryConfigEntrypoints(VADriverContextP ctx,
switch (profile) {
case VAProfileMPEG2Simple:
case VAProfileMPEG2Main:
- entrypoint_list[n++] = VAEntrypointVLD;
+ if (HAS_MPEG2(i965))
+ entrypoint_list[n++] = VAEntrypointVLD;
break;
case VAProfileH264Baseline:
@@ -268,7 +275,7 @@ i965_CreateConfig(VADriverContextP ctx,
switch (profile) {
case VAProfileMPEG2Simple:
case VAProfileMPEG2Main:
- if (VAEntrypointVLD == entrypoint) {
+ if (HAS_MPEG2(i965) && VAEntrypointVLD == entrypoint) {
vaStatus = VA_STATUS_SUCCESS;
} else {
vaStatus = VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT;
@@ -838,14 +845,15 @@ i965_destroy_buffer(struct object_heap *heap, struct object_base *obj)
object_heap_free(heap, obj);
}
-VAStatus
-i965_CreateBuffer(VADriverContextP ctx,
- VAContextID context, /* in */
- VABufferType type, /* in */
- unsigned int size, /* in */
- unsigned int num_elements, /* in */
- void *data, /* in */
- VABufferID *buf_id) /* out */
+static VAStatus
+i965_create_buffer_internal(VADriverContextP ctx,
+ VAContextID context,
+ VABufferType type,
+ unsigned int size,
+ unsigned int num_elements,
+ void *data,
+ dri_bo *store_bo,
+ VABufferID *buf_id)
{
struct i965_driver_data *i965 = i965_driver_data(ctx);
struct object_buffer *obj_buffer = NULL;
@@ -887,7 +895,13 @@ i965_CreateBuffer(VADriverContextP ctx,
assert(buffer_store);
buffer_store->ref_count = 1;
- if (type == VASliceDataBufferType || type == VAImageBufferType) {
+ if (store_bo != NULL) {
+ buffer_store->bo = store_bo;
+ dri_bo_reference(buffer_store->bo);
+
+ if (data)
+ dri_bo_subdata(buffer_store->bo, 0, size * num_elements, data);
+ } else if (type == VASliceDataBufferType || type == VAImageBufferType) {
buffer_store->bo = dri_bo_alloc(i965->intel.bufmgr,
"Buffer",
size * num_elements, 64);
@@ -911,6 +925,18 @@ i965_CreateBuffer(VADriverContextP ctx,
return VA_STATUS_SUCCESS;
}
+VAStatus
+i965_CreateBuffer(VADriverContextP ctx,
+ VAContextID context, /* in */
+ VABufferType type, /* in */
+ unsigned int size, /* in */
+ unsigned int num_elements, /* in */
+ void *data, /* in */
+ VABufferID *buf_id) /* out */
+{
+ return i965_create_buffer_internal(ctx, context, type, size, num_elements, data, NULL, buf_id);
+}
+
VAStatus
i965_BufferSetNumElements(VADriverContextP ctx,
@@ -950,7 +976,15 @@ i965_MapBuffer(VADriverContextP ctx,
assert(!(obj_buffer->buffer_store->bo && obj_buffer->buffer_store->buffer));
if (NULL != obj_buffer->buffer_store->bo) {
- dri_bo_map(obj_buffer->buffer_store->bo, 1);
+ unsigned int tiling, swizzle;
+
+ dri_bo_get_tiling(obj_buffer->buffer_store->bo, &tiling, &swizzle);
+
[...3033 lines suppressed...]
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0700 },
+ { 0x00800001, 0x27000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0800 },
+ { 0x00800001, 0x28000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0840 },
+ { 0x00800001, 0x28400381, 0x008d0400, 0x00000000 },
+ { 0x00800001, 0x21400229, 0x00cf0700, 0x00000000 },
+ { 0x00800001, 0x22400229, 0x00cf0800, 0x00000000 },
+ { 0x00800001, 0x23400229, 0x00cf0840, 0x00000000 },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x02800031, 0x27001cc9, 0x00000020, 0x0a8a0101 },
+ { 0x02800031, 0x28001cc9, 0x00000020, 0x0a8a0202 },
+ { 0x00800040, 0x208077be, 0x008d0580, 0x00000038 },
+ { 0x00800040, 0x258077bd, 0x008d0580, 0x00000038 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0700 },
+ { 0x00800001, 0x27000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0800 },
+ { 0x00800001, 0x28000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0840 },
+ { 0x00800001, 0x28400381, 0x008d0400, 0x00000000 },
+ { 0x00800001, 0x21600229, 0x00cf0700, 0x00000000 },
+ { 0x00800001, 0x22600229, 0x00cf0800, 0x00000000 },
+ { 0x00800001, 0x23600229, 0x00cf0840, 0x00000000 },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x02800031, 0x27001cc9, 0x00000020, 0x0a8a0101 },
+ { 0x02800031, 0x28001cc9, 0x00000020, 0x0a8a0202 },
+ { 0x00800040, 0x208077be, 0x008d0580, 0x00000038 },
+ { 0x00800040, 0x258077bd, 0x008d0580, 0x00000038 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0700 },
+ { 0x00800001, 0x27000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0800 },
+ { 0x00800001, 0x28000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0840 },
+ { 0x00800001, 0x28400381, 0x008d0400, 0x00000000 },
+ { 0x00800001, 0x21800229, 0x00cf0700, 0x00000000 },
+ { 0x00800001, 0x22800229, 0x00cf0800, 0x00000000 },
+ { 0x00800001, 0x23800229, 0x00cf0840, 0x00000000 },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x02800031, 0x27001cc9, 0x00000020, 0x0a8a0101 },
+ { 0x02800031, 0x28001cc9, 0x00000020, 0x0a8a0202 },
+ { 0x00800040, 0x208077be, 0x008d0580, 0x00000038 },
+ { 0x00800040, 0x258077bd, 0x008d0580, 0x00000038 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0700 },
+ { 0x00800001, 0x27000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0800 },
+ { 0x00800001, 0x28000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0840 },
+ { 0x00800001, 0x28400381, 0x008d0400, 0x00000000 },
+ { 0x00800001, 0x21a00229, 0x00cf0700, 0x00000000 },
+ { 0x00800001, 0x22a00229, 0x00cf0800, 0x00000000 },
+ { 0x00800001, 0x23a00229, 0x00cf0840, 0x00000000 },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x02800031, 0x27001cc9, 0x00000020, 0x0a8a0101 },
+ { 0x02800031, 0x28001cc9, 0x00000020, 0x0a8a0202 },
+ { 0x00800040, 0x208077be, 0x008d0580, 0x00000038 },
+ { 0x00800040, 0x258077bd, 0x008d0580, 0x00000038 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0700 },
+ { 0x00800001, 0x27000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0800 },
+ { 0x00800001, 0x28000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0840 },
+ { 0x00800001, 0x28400381, 0x008d0400, 0x00000000 },
+ { 0x00800001, 0x21c00229, 0x00cf0700, 0x00000000 },
+ { 0x00800001, 0x22c00229, 0x00cf0800, 0x00000000 },
+ { 0x00800001, 0x23c00229, 0x00cf0840, 0x00000000 },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x02800031, 0x27001cc9, 0x00000020, 0x0a8a0101 },
+ { 0x02800031, 0x28001cc9, 0x00000020, 0x0a8a0202 },
+ { 0x00800040, 0x208077be, 0x008d0580, 0x00000038 },
+ { 0x00800040, 0x258077bd, 0x008d0580, 0x00000038 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0700 },
+ { 0x00800001, 0x27000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0800 },
+ { 0x00800001, 0x28000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0840 },
+ { 0x00800001, 0x28400381, 0x008d0400, 0x00000000 },
+ { 0x00800001, 0x21e00229, 0x00cf0700, 0x00000000 },
+ { 0x00800001, 0x22e00229, 0x00cf0800, 0x00000000 },
+ { 0x00800001, 0x23e00229, 0x00cf0840, 0x00000000 },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x02800031, 0x27001cc9, 0x00000020, 0x0a8a0101 },
+ { 0x02800031, 0x28001cc9, 0x00000020, 0x0a8a0202 },
+ { 0x00800040, 0x208077be, 0x008d0580, 0x00000038 },
+ { 0x00800040, 0x258077bd, 0x008d0580, 0x00000038 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0700 },
+ { 0x00800001, 0x27000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0800 },
+ { 0x00800001, 0x28000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0840 },
+ { 0x00800001, 0x28400381, 0x008d0400, 0x00000000 },
+ { 0x00800001, 0x22000229, 0x00cf0700, 0x00000000 },
+ { 0x00800001, 0x23000229, 0x00cf0800, 0x00000000 },
+ { 0x00800001, 0x24000229, 0x00cf0840, 0x00000000 },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x02800031, 0x27001cc9, 0x00000020, 0x0a8a0101 },
+ { 0x02800031, 0x28001cc9, 0x00000020, 0x0a8a0202 },
+ { 0x00800040, 0x208077be, 0x008d0580, 0x00000038 },
+ { 0x00800040, 0x258077bd, 0x008d0580, 0x00000038 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0700 },
+ { 0x00800001, 0x27000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0800 },
+ { 0x00800001, 0x28000381, 0x008d0400, 0x00000000 },
+ { 0x00800059, 0x240077bc, 0x00000570, 0x008d0840 },
+ { 0x00800001, 0x28400381, 0x008d0400, 0x00000000 },
+ { 0x00800001, 0x22200229, 0x00cf0700, 0x00000000 },
+ { 0x00800001, 0x23200229, 0x00cf0800, 0x00000000 },
+ { 0x00800001, 0x24200229, 0x00cf0840, 0x00000000 },
+ { 0x00600001, 0x22400129, 0x00ae0240, 0x00000000 },
+ { 0x00600001, 0x23400129, 0x00ae0340, 0x00000000 },
+ { 0x00600001, 0x22500129, 0x00ae0280, 0x00000000 },
+ { 0x00600001, 0x23500129, 0x00ae0380, 0x00000000 },
+ { 0x00600001, 0x22600129, 0x00ae02c0, 0x00000000 },
+ { 0x00600001, 0x23600129, 0x00ae03c0, 0x00000000 },
+ { 0x00600001, 0x22700129, 0x00ae0300, 0x00000000 },
+ { 0x00600001, 0x23700129, 0x00ae0400, 0x00000000 },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x00200001, 0x202001a6, 0x004500a0, 0x00000000 },
+ { 0x00000001, 0x20280062, 0x00000000, 0x0007000f },
+ { 0x00000005, 0x24000c20, 0x000000b8, 0x00ffffff },
+ { 0x04000010, 0x20000c04, 0x00000400, 0x00ffffff },
+ { 0x00010220, 0x34001c00, 0x00001400, 0x00000056 },
+ { 0x04600031, 0x27000cc1, 0x00000020, 0x02498007 },
+ { 0x0000040c, 0x21043da1, 0x000000a2, 0x00010001 },
+ { 0x00000801, 0x21080061, 0x00000000, 0x0003000f },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x04600031, 0x28000cc1, 0x00000020, 0x02298008 },
+ { 0x00200001, 0x210001a1, 0x004500a0, 0x00000000 },
+ { 0x00000001, 0x21080061, 0x00000000, 0x0007000f },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x00000001, 0x26020228, 0x000000ba, 0x00000000 },
+ { 0x00610001, 0x24400129, 0x020000b8, 0x00000000 },
+ { 0x00710001, 0x24400169, 0x02000000, 0x00000000 },
+ { 0x00000001, 0x24600061, 0x00000000, 0x00040001 },
+ { 0x00000001, 0x24640061, 0x00000000, 0x00400010 },
+ { 0x00000001, 0x24680061, 0x00000000, 0x04000100 },
+ { 0x00000001, 0x246c0061, 0x00000000, 0x40001000 },
+ { 0x00000001, 0x26020128, 0x00000440, 0x00000000 },
+ { 0x00910001, 0x41400231, 0x02b10700, 0x00000000 },
+ { 0x02600005, 0x2000252c, 0x02000440, 0x008d0460 },
+ { 0x00710001, 0x42400231, 0x02ae0800, 0x00000000 },
+ { 0x00710001, 0x43400231, 0x02ae0801, 0x00000000 },
+ { 0x00000001, 0x26020128, 0x00000442, 0x00000000 },
+ { 0x00910001, 0x41600231, 0x02b10710, 0x00000000 },
+ { 0x00000001, 0x26020128, 0x00000444, 0x00000000 },
+ { 0x00910001, 0x41800231, 0x02b10720, 0x00000000 },
+ { 0x02600005, 0x2000252c, 0x02000444, 0x008d0460 },
+ { 0x00710001, 0x42500231, 0x02ae0810, 0x00000000 },
+ { 0x00710001, 0x43500231, 0x02ae0811, 0x00000000 },
+ { 0x00000001, 0x26020128, 0x00000446, 0x00000000 },
+ { 0x00910001, 0x41a00231, 0x02b10730, 0x00000000 },
+ { 0x00000001, 0x26020128, 0x00000448, 0x00000000 },
+ { 0x00910001, 0x41c00231, 0x02b10740, 0x00000000 },
+ { 0x02600005, 0x2000252c, 0x02000448, 0x008d0460 },
+ { 0x00710001, 0x42600231, 0x02ae0820, 0x00000000 },
+ { 0x00710001, 0x43600231, 0x02ae0821, 0x00000000 },
+ { 0x00000001, 0x26020128, 0x0000044a, 0x00000000 },
+ { 0x00910001, 0x41e00231, 0x02b10750, 0x00000000 },
+ { 0x00000001, 0x26020128, 0x0000044c, 0x00000000 },
+ { 0x00910001, 0x42000231, 0x02b10760, 0x00000000 },
+ { 0x02600005, 0x2000252c, 0x0200044c, 0x008d0460 },
+ { 0x00710001, 0x42700231, 0x02ae0830, 0x00000000 },
+ { 0x00710001, 0x43700231, 0x02ae0831, 0x00000000 },
+ { 0x00000001, 0x26020128, 0x0000044e, 0x00000000 },
+ { 0x00910001, 0x42200231, 0x02b10770, 0x00000000 },
+ { 0x00800001, 0x20400232, 0x00d20140, 0x00000000 },
+ { 0x00800001, 0x20500232, 0x00d20160, 0x00000000 },
+ { 0x00800001, 0x20600232, 0x00d20180, 0x00000000 },
+ { 0x00800001, 0x20700232, 0x00d201a0, 0x00000000 },
+ { 0x00800001, 0x20800232, 0x00d201c0, 0x00000000 },
+ { 0x00800001, 0x20900232, 0x00d201e0, 0x00000000 },
+ { 0x00800001, 0x20a00232, 0x00d20200, 0x00000000 },
+ { 0x00800001, 0x20b00232, 0x00d20220, 0x00000000 },
+ { 0x05600031, 0x20000cc4, 0x00000020, 0x0a094007 },
+ { 0x00200001, 0x210001a5, 0x004500a0, 0x00000000 },
+ { 0x0000000c, 0x21043ca5, 0x00000104, 0x00010001 },
+ { 0x00000001, 0x21080061, 0x00000000, 0x0003000f },
+ { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
+ { 0x00800001, 0x40400232, 0x00d20240, 0x00000000 },
+ { 0x00800001, 0x40410232, 0x00d20340, 0x00000000 },
+ { 0x00800001, 0x40600232, 0x00d20260, 0x00000000 },
+ { 0x00800001, 0x40610232, 0x00d20360, 0x00000000 },
+ { 0x05600031, 0x20000cc4, 0x00000020, 0x06094008 },
+ { 0x01000040, 0x20863dad, 0x00000086, 0xffffffff },
+ { 0x00000040, 0x20a03dad, 0x000000a0, 0x00100010 },
+ { 0x05000010, 0x200035ac, 0x020000a0, 0x00000084 },
+ { 0x00000041, 0x24407fbd, 0x000000bc, 0x41800000 },
+ { 0x00000040, 0x20a477bd, 0x00000440, 0x000000a4 },
+ { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
+ { 0x00010220, 0x34001c00, 0x02001400, 0xfffffe66 },
+ { 0x00000001, 0x20a001ad, 0x0000008a, 0x00000000 },
+ { 0x00000040, 0x20a23dad, 0x000000a2, 0x00080008 },
+ { 0x00000001, 0x20a403bd, 0x00000094, 0x00000000 },
+ { 0x00000041, 0x24407fbd, 0x00000038, 0x41000000 },
+ { 0x00000040, 0x20a877bd, 0x00000440, 0x000000a8 },
+ { 0x00000220, 0x34001c00, 0x00001400, 0xfffffe5a },
+ { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+ { 0x00600001, 0x21e00022, 0x008d0000, 0x00000000 },
+ { 0x07000031, 0x20001cc4, 0x000001e0, 0x82000010 },
+ { 0x00600001, 0x21e00022, 0x008d0000, 0x00000000 },
+ { 0x07000031, 0x20001cc4, 0x000001e0, 0x82000010 },
13 years, 1 month
rpms/libva-freeworld/devel libva-freeworld.spec,1.3,1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libva-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31127
Modified Files:
libva-freeworld.spec
Log Message:
Add patch from today (only affects the backend driver no API changes)
Index: libva-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/libva-freeworld/devel/libva-freeworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libva-freeworld.spec 10 Mar 2011 15:09:52 -0000 1.3
+++ libva-freeworld.spec 10 Mar 2011 16:24:11 -0000 1.4
@@ -7,6 +7,7 @@
URL: http://freedesktop.org/wiki/Software/vaapi
Source0: http://cgit.freedesktop.org/libva/snapshot/libva-%{version}.tar.bz2
Patch0: 101_dont_install_test_programs.patch
+Patch1: libva-1.0.10-20110310.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool
BuildRequires: libudev-devel
@@ -24,6 +25,7 @@
%prep
%setup -q -n libva-%{version}
%patch0 -p1 -b .testprogs
+%patch1 -p1 -b .git
%build
autoreconf -i
@@ -55,6 +57,7 @@
%changelog
* Thu Mar 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.10-1
- Switch to additional package using the freedesktop version
+- Add git rev from today as patch
* Mon Feb 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.10-1
- Update to 1.0.10
13 years, 1 month
rpms/gpac/devel gpac-0.4.6-noldflag.patch, NONE, 1.1 gpac.spec, 1.23, 1.24
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28325
Modified Files:
gpac.spec
Added Files:
gpac-0.4.6-noldflag.patch
Log Message:
Add patch
gpac-0.4.6-noldflag.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gpac-0.4.6-noldflag.patch ---
diff -up gpac/configure.noldflag gpac/configure
--- gpac/configure.noldflag 2011-03-10 16:15:56.887459002 +0100
+++ gpac/configure 2011-03-10 16:58:50.029459001 +0100
@@ -143,7 +143,7 @@ extralibs="-lm"
bigendian="no"
SHFLAGS=-shared
need_inet_aton="no"
-LDFLAGS="$LDFLAGS -Wl --warn-common"
+#LDFLAGS="$LDFLAGS -Wl --warn-common"
CFLAGS=""
CPPFLAGS=""
GPAC_SH_FLAGS=-lpthread
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gpac.spec 10 Mar 2011 14:28:27 -0000 1.23
+++ gpac.spec 10 Mar 2011 16:02:55 -0000 1.24
@@ -32,6 +32,7 @@
#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853857&group_id=84101
Patch9: gpac-0.4.6-ffmpeg.patch
Patch11: gpac-0.4.6-osmo.patch
+Patch12: gpac-0.4.6-noldflag.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
@@ -153,6 +154,7 @@
%patch5 -p1 -b .jscflags
%patch9 -p1 -b .ffmpeg
%patch11 -p1 -b .osmo
+%patch12 -p1 -b .noldflag
## kwizart - enable dynamic mode - hardcoded with patch2
# define SONAME number from the first number of gpac version.
@@ -336,6 +338,7 @@
%changelog
* Thu Mar 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.12.cvs20100527
- Rebuilt for openjpeg
+- Remove usage of --warn-common as LDFLAGS
* Tue Dec 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.11.cvs20100527
- Fix include - rfbz#1551
13 years, 1 month