pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib Add PLIST.FreeBSD and three patche...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4ce4fa8b4dc8
branches: trunk
changeset: 494649:4ce4fa8b4dc8
user: reed <reed%pkgsrc.org@localhost>
date: Thu May 26 22:47:22 2005 +0000
description:
Add PLIST.FreeBSD and three patches to make it build for FreeBSD.
Add patch-ak and patch-an to support -enable-fpic with recent
versions of gcc. From xine cvs.
Bump PKGREVISION just in case these patch-ak and patch-an change
functionality.
Tested builds and running on FreeBSD 5.4-STABLE with gcc 3.4.2 and
FreeBSD 5.3, and Linux 2.6.9 with gcc 3.3.5. And tested build
and install on NetBSD 1.6.2_STABLE.
Okayed by jmmv a couple weeks ago.
diffstat:
multimedia/xine-lib/Makefile | 4 +-
multimedia/xine-lib/PLIST.FreeBSD | 29 +++++++++++++
multimedia/xine-lib/distinfo | 7 ++-
multimedia/xine-lib/patches/patch-af | 17 ++++++++
multimedia/xine-lib/patches/patch-aj | 41 +++++++++++++++++++
multimedia/xine-lib/patches/patch-ak | 26 ++++++++++++
multimedia/xine-lib/patches/patch-al | 20 +++++++++
multimedia/xine-lib/patches/patch-an | 76 ++++++++++++++++++++++++++++++++++++
8 files changed, 217 insertions(+), 3 deletions(-)
diffs (272 lines):
diff -r 210a782b3a25 -r 4ce4fa8b4dc8 multimedia/xine-lib/Makefile
--- a/multimedia/xine-lib/Makefile Thu May 26 22:41:58 2005 +0000
+++ b/multimedia/xine-lib/Makefile Thu May 26 22:47:22 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2005/05/10 00:16:42 reed Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/26 22:47:22 reed Exp $
.include "Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Multimedia player library
BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
diff -r 210a782b3a25 -r 4ce4fa8b4dc8 multimedia/xine-lib/PLIST.FreeBSD
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/PLIST.FreeBSD Thu May 26 22:47:22 2005 +0000
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST.FreeBSD,v 1.1 2005/05/26 22:47:22 reed Exp $
+lib/xine/plugins/${PKGVERSION}/vidix/cyberblade_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/cyberblade_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/mach64_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/mach64_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/mga_crtc2_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/mga_crtc2_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/mga_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/mga_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/nvidia_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/nvidia_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/pm2_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/pm2_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/pm3_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/pm3_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/radeon_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/radeon_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/rage128_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/rage128_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/savage_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/savage_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/sis_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/sis_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/unichrome_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/unichrome_vid.so
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_oss.a
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_oss.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_vidix.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_vidix.so
diff -r 210a782b3a25 -r 4ce4fa8b4dc8 multimedia/xine-lib/distinfo
--- a/multimedia/xine-lib/distinfo Thu May 26 22:41:58 2005 +0000
+++ b/multimedia/xine-lib/distinfo Thu May 26 22:47:22 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2005/05/02 11:29:35 drochner Exp $
+$NetBSD: distinfo,v 1.19 2005/05/26 22:47:22 reed Exp $
SHA1 (xine-lib-1.0.1.tar.gz) = 9973c4674a433baccd81988df0746d9e2d111df8
RMD160 (xine-lib-1.0.1.tar.gz) = 1e4de9b222a914b516d6cfa08695a9ccad3f3db8
@@ -8,10 +8,15 @@
SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
+SHA1 (patch-af) = f190e1595e1644b844bdc3d9e19975c03e73bb55
SHA1 (patch-ag) = 536e98365a149624083b23cc65af8d4c2320b8d8
SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
+SHA1 (patch-aj) = a213d316b5e3e486fe4c7c474a449408972db6f0
+SHA1 (patch-ak) = 75354613440b00aea76fabf1f6cc68808cf6c988
+SHA1 (patch-al) = 71e416030e14bde560b6fb58f5bfa5d1493bce62
SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16
+SHA1 (patch-an) = e7e507e59417301e55e62c71b3a0039c32a8b7c7
SHA1 (patch-ao) = 425257d43fb0f2c42590401ad17d829b03a28773
SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
SHA1 (patch-aq) = 18d1f40634e76e0d05c1dd431142618fe98cf7ce
diff -r 210a782b3a25 -r 4ce4fa8b4dc8 multimedia/xine-lib/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-af Thu May 26 22:47:22 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.3 2005/05/26 22:47:22 reed Exp $
+
+--- src/video_out/video_out_sdl.c.orig Sat May 7 11:04:14 2005
++++ src/video_out/video_out_sdl.c Sat May 7 11:04:27 2005
+@@ -47,11 +47,7 @@
+ #include <string.h>
+ #include <inttypes.h>
+ #include <math.h>
+-#if defined (__FreeBSD__)
+-# include <SDL11/SDL.h>
+-#else
+-# include <SDL.h>
+-#endif
++#include <SDL.h>
+
+ #define LOG_MODULE "video_out_sdl"
+ #define LOG_VERBOSE
diff -r 210a782b3a25 -r 4ce4fa8b4dc8 multimedia/xine-lib/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-aj Thu May 26 22:47:22 2005 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-aj,v 1.7 2005/05/26 22:47:22 reed Exp $
+
+--- src/input/input_cdda.c.orig Sat May 7 11:23:26 2005
++++ src/input/input_cdda.c Sat May 7 12:01:28 2005
+@@ -32,6 +32,9 @@
+ #include <unistd.h>
+
+ #include <sys/types.h>
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
+ #include <dirent.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+@@ -684,18 +687,26 @@
+ unsigned char *data) {
+
+ int fd = this_gen->fd;
++#if !defined(__FreeBSD__) || (__FreeBSD_version < 501106)
+ struct ioc_read_audio cdda;
++#endif
+
+ while( num_frames ) {
++#if !defined(__FreeBSD__) || (__FreeBSD_version < 501106)
+ cdda.address_format = CD_MSF_FORMAT;
+ cdda.address.msf.minute = frame / CD_SECONDS_PER_MINUTE / CD_FRAMES_PER_SECOND;
+ cdda.address.msf.second = (frame / CD_FRAMES_PER_SECOND) % CD_SECONDS_PER_MINUTE;
+ cdda.address.msf.frame = frame % CD_FRAMES_PER_SECOND;
+ cdda.nframes = 1;
+ cdda.buffer = data;
++#endif
+
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 501106)
++ if (pread(fd, data, CD_RAW_FRAME_SIZE, frame * CD_RAW_FRAME_SIZE) != CD_RAW_FRAME_SIZE) {
++#else
+ /* read a frame */
+ if(ioctl(fd, CDIOCREADAUDIO, &cdda) < 0) {
++#endif
+ perror("CDIOCREADAUDIO");
+ return -1;
+ }
diff -r 210a782b3a25 -r 4ce4fa8b4dc8 multimedia/xine-lib/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-ak Thu May 26 22:47:22 2005 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-ak,v 1.5 2005/05/26 22:47:22 reed Exp $
+Support --enable-fpic with recent versions of gcc.
+From xine cvs.
+
+--- src/post/goom/mmx.h.orig Sat May 7 18:00:46 2005
++++ src/post/goom/mmx.h Sat May 7 18:01:45 2005
+@@ -72,6 +72,7 @@
+ register int rval = 0;
+
+ __asm__ __volatile__ (
++ "push %%ebx\n\t"
+ /* See if CPUID instruction is supported ... */
+ /* ... Get copies of EFLAGS into eax and ecx */
+ "pushf\n\t"
+@@ -214,9 +215,10 @@
+ "movl $0, %0\n\n\t"
+
+ "Return:\n\t"
++ "pop %%ebx\n\t"
+ : "=X" (rval)
+ : /* no input */
+- : "eax", "ebx", "ecx", "edx"
++ : "eax", "ecx", "edx"
+ );
+
+ /* Return */
diff -r 210a782b3a25 -r 4ce4fa8b4dc8 multimedia/xine-lib/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-al Thu May 26 22:47:22 2005 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-al,v 1.3 2005/05/26 22:47:22 reed Exp $
+Bug fix from CVS: Clip goom fps value to >= 1 [xine bug #1193783]
+
+--- src/post/goom/xine_goom.c.orig Sat May 7 18:03:44 2005
++++ src/post/goom/xine_goom.c Sat May 7 18:04:41 2005
+@@ -145,9 +145,13 @@
+
+ if(class->ip) {
+ post_plugin_goom_t *this = class->ip;
++
++ if (cfg->num_value < 1)
++ cfg->num_value = 1;
++
+ this->fps = cfg->num_value;
+
+- if(this->sample_rate && this->fps)
++ if(this->sample_rate)
+ this->samples_per_frame = this->sample_rate / this->fps;
+ }
+ }
diff -r 210a782b3a25 -r 4ce4fa8b4dc8 multimedia/xine-lib/patches/patch-an
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-an Thu May 26 22:47:22 2005 +0000
@@ -0,0 +1,76 @@
+$NetBSD: patch-an,v 1.3 2005/05/26 22:47:22 reed Exp $
+Support --enable-fpic with recent versions of gcc.
+From xine cvs.
+
+--- src/post/goom/xmmx.c.orig Sat May 7 18:06:07 2005
++++ src/post/goom/xmmx.c Sat May 7 18:06:59 2005
+@@ -112,23 +112,23 @@
+ * post : mm3 & mm4 : coefs for this position
+ * mm1 : X vector [0|X]
+ *
+- * modif : eax,ebx
++ * modif : eax,ecx
+ */
+ __asm__ __volatile__ (
+- "movd %%mm0,%%ebx\n"
++ "movd %%mm0,%%ecx\n"
+ "movq %%mm0,%%mm1\n"
+
+- "andl $15,%%ebx\n"
++ "andl $15,%%ecx\n"
+ "psrlq $32,%%mm1\n"
+
+- "shll $6,%%ebx\n"
++ "shll $6,%%ecx\n"
+ "movd %%mm1,%%eax\n"
+
+- "addl %0,%%ebx\n"
++ "addl %0,%%ecx\n"
+ "andl $15,%%eax\n"
+
+- "movd (%%ebx,%%eax,4),%%mm3\n"
+- ::"g"(precalCoef):"eax","ebx");
++ "movd (%%ecx,%%eax,4),%%mm3\n"
++ ::"g"(precalCoef):"eax","ecx");
+
+ /*
+ * extraction des coefficients...
+@@ -158,7 +158,7 @@
+ * post : mm0 : expix1[position]
+ * mm2 : expix1[position+largeur]
+ *
+- * modif : eax,ebx
++ * modif : eax,ecx
+ */
+ psrld_i2r (PERTEDEC,mm0);
+ psrld_i2r (PERTEDEC,mm1);
+@@ -167,23 +167,23 @@
+ /*^*/ "movq %%mm3,%%mm5\n" /*^*/
+
+ "mull %1\n"
+- "movd %%mm0,%%ebx\n"
++ "movd %%mm0,%%ecx\n"
+ /*^*/ "punpcklbw %%mm5, %%mm3\n" /*^*/
+
+- "addl %%ebx,%%eax\n"
++ "addl %%ecx,%%eax\n"
+ /*^*/ "movq %%mm3,%%mm4\n" /*^*/
+ /*^*/ "movq %%mm3,%%mm5\n" /*^*/
+
+- "movl %0,%%ebx\n"
++ "movl %0,%%ecx\n"
+ /*^*/ "punpcklbw %%mm5,%%mm3\n" /*^*/
+
+- "movq (%%ebx,%%eax,4),%%mm0\n"
++ "movq (%%ecx,%%eax,4),%%mm0\n"
+ /*^*/ "punpckhbw %%mm5,%%mm4\n" /*^*/
+
+ "addl %1,%%eax\n"
+- "movq (%%ebx,%%eax,4),%%mm2\n"
++ "movq (%%ecx,%%eax,4),%%mm2\n"
+
+- : : "X"(expix1), "X"(prevX):"eax","ebx"
++ : : "X"(expix1), "X"(prevX):"eax","ecx"
+ );
+
+ /*
Home |
Main Index |
Thread Index |
Old Index