[Glibc-bsd-commits] r1668 - trunk/web/patches

[Aurelien Jarno]

Author: aurel32
Date: 2006-10-05 21:54:36 +0000 (Thu, 05 Oct 2006)
New Revision: 1668

Added:
   trunk/web/patches/totem.diff
Log:
Add patch for totem.



Added: trunk/web/patches/totem.diff
===================================================================
--- trunk/web/patches/totem.diff	                        (rev 0)
+++ trunk/web/patches/totem.diff	2006-10-05 21:54:36 UTC (rev 1668)
@@ -0,0 +1,71 @@
+diff -u totem-1.4.5/debian/patches/00list totem-1.4.5/debian/patches/00list
+--- totem-1.4.5/debian/patches/00list
++++ totem-1.4.5/debian/patches/00list
+@@ -2,2 +2,3 @@
+ 20_use_alternatives
++30_kfreebsd_gnu
+ 60_mandatory-relibtoolizing
+--- totem-1.4.5.orig/debian/patches/30_kfreebsd_gnu.dpatch
++++ totem-1.4.5/debian/patches/30_kfreebsd_gnu.dpatch
+@@ -0,0 +1,61 @@
++#! /bin/sh -e
++## 30_kfreebsd_gnu.dpatch by Joe Marcus Clarke <marcus at marcuscom.com> 
++##                       and Aurelien Jarno <aurel32 at debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: No description.
++
++if [ $# -lt 1 ]; then
++    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++    exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
++
++case "$1" in
++    -patch) patch -p1 ${patch_opts} < $0;;
++    -unpatch) patch -R -p1 ${patch_opts} < $0;;
++    *)
++        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++        exit 1;;
++esac
++
++exit 0
++
++ at DPATCH@
++--- totem-1.2.1.orig/src/plparse/totem-disc.c	2006-02-07 20:24:54.000000000 +0100
+++++ totem-1.2.1/src/plparse/totem-disc.c	2006-02-07 20:26:43.000000000 +0100
++@@ -43,7 +43,32 @@
++ #include <glib/gi18n.h>
++ #include <libgnomevfs/gnome-vfs.h>
++ 
+++#if defined (__linux__)
+++#include <mntent.h>
++ #include <linux/cdrom.h>
+++#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
+++#include <sys/cdio.h>
+++#include <sys/disklabel.h>
+++
+++#define CDROM_DRIVE_STATUS      0x5326
+++#define CDROM_DISC_STATUS       0x5327
+++#define CDS_AUDIO               100
+++#define CDS_MIXED               105
+++#define CDS_DATA_1              101
+++#define CDS_DATA_2              102
+++#define CDS_NO_INFO             0       /* if not implemented */
+++#define CDS_NO_DISC             1
+++#define CDS_TRAY_OPEN           2
+++#define CDS_DRIVE_NOT_READY     3
+++#define CDS_DISC_OK             4
+++#define CDS_XA_2_1              103
+++#define CDS_XA_2_2              104
+++#define CDC_DVD                 0x8000
+++#define ENOMEDIUM ENODEV
+++#define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
+++#else
+++# error "Unknown system"
+++#endif
++ 
++ #include "totem-disc.h"
++