[SCM] libdvdnav/master: drop all patches, merged upstream
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Aug 16 13:26:39 UTC 2014
The following commit has been merged in the master branch:
commit 2bd597b623daaa68fa7905569da46a9c416cdac9
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Aug 15 22:53:48 2014 -0400
drop all patches, merged upstream
diff --git a/debian/patches/0001-inttypes.patch b/debian/patches/0001-inttypes.patch
deleted file mode 100644
index c282d35..0000000
--- a/debian/patches/0001-inttypes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Dominik Mierzejewski <rpm at greysector.net>
-Description: Add missing <stdint.h.h> include for uint32_t.
-
---- a/src/dvdnav/dvd_types.h
-+++ b/src/dvdnav/dvd_types.h
-@@ -26,6 +26,8 @@
- #ifndef LIBDVDNAV_DVD_TYPES_H
- #define LIBDVDNAV_DVD_TYPES_H
-
-+#include <stdint.h>
-+
- /*
- * DVD Menu ID
- * (see dvdnav_menu_call())
diff --git a/debian/patches/0002-hurd.patch b/debian/patches/0002-hurd.patch
deleted file mode 100644
index cccf663..0000000
--- a/debian/patches/0002-hurd.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Author: Guillem Jover <guillem at debian.org>
-Description:
- Use dynamically allocated strings instead of hardcoded size ones to fix FTBFS
- on hurd (Closes: #641028).
-
---- a/src/dvdnav.c
-+++ b/src/dvdnav.c
-@@ -105,8 +105,7 @@
- }
-
- /* Set the path. FIXME: Is a deep copy 'right' */
-- strncpy(this->path, path, MAX_PATH_LEN - 1);
-- this->path[MAX_PATH_LEN - 1] = '\0';
-+ this->path = strdup(path);
-
- /* Pre-open and close a file so that the CSS-keys are cached. */
- this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS);
---- a/src/dvdnav_internal.h
-+++ b/src/dvdnav_internal.h
-@@ -65,13 +65,6 @@
- /* Maximum length of an error string */
- #define MAX_ERR_LEN 255
-
--/* Use the POSIX PATH_MAX if available */
--#ifdef PATH_MAX
--#define MAX_PATH_LEN PATH_MAX
--#else
--#define MAX_PATH_LEN 255 /* Arbitrary */
--#endif
--
- #ifndef DVD_VIDEO_LB_LEN
- #define DVD_VIDEO_LB_LEN 2048
- #endif
-@@ -144,7 +137,7 @@
-
- struct dvdnav_s {
- /* General data */
-- char path[MAX_PATH_LEN]; /* Path to DVD device/dir */
-+ char *path; /* Path to DVD device/dir */
- dvd_file_t *file; /* Currently opened file */
-
- /* Position data */
---- a/src/remap.c
-+++ b/src/remap.c
-@@ -28,10 +28,6 @@
- #ifndef _MSC_VER
- #include <sys/param.h>
- #include <fcntl.h>
--#else
--#ifndef MAXPATHLEN
--#define MAXPATHLEN 255
--#endif
- #endif /* _MSC_VER */
-
- #include <inttypes.h>
-@@ -191,7 +187,7 @@
-
- remap_t* remap_loadmap( char *title) {
- char buf[160];
-- char fname[MAXPATHLEN];
-+ char *fname;
- char *home;
- int res;
- FILE *fp;
-@@ -205,14 +201,19 @@
- fprintf(MSG_OUT, "libdvdnav: Unable to find home directory" );
- return NULL;
- }
-- snprintf(fname, sizeof(fname), "%s/.dvdnav/%s.map", home, title);
-+ fname = malloc(strlen("/.dvdnav/.map") + strlen(home) + strlen(title) + 1);
-+ if (!fname)
-+ return NULL;
-+ sprintf(fname, "%s/.dvdnav/%s.map", home, title);
-
- /* Open the map file */
- fp = fopen( fname, "r");
- if (!fp) {
- fprintf(MSG_OUT, "libdvdnav: Unable to find map file '%s'\n", fname);
-+ free(fname);
- return NULL;
- }
-+ free(fname);
-
- /* Load the map file */
- map = remap_new( title);
diff --git a/debian/patches/0003-Adds-a-function-to-create-a-dpu-of-a-dvdnav-handle.patch b/debian/patches/0003-Adds-a-function-to-create-a-dpu-of-a-dvdnav-handle.patch
deleted file mode 100644
index f3c5d33..0000000
--- a/debian/patches/0003-Adds-a-function-to-create-a-dpu-of-a-dvdnav-handle.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 5c7ddc5ca6cde54743b3ce019cb757022e47c71e Mon Sep 17 00:00:00 2001
-From: Erik Hovland <erik at hovland.org>
-Date: Mon, 21 May 2012 16:41:55 -0700
-Subject: [PATCH] Adds a function to create a dpu of a dvdnav handle
-
-This adds a function to create a duplicate of a dvdnav handle and it's
-state. This allows you to recursively move through the handle. HandBrake
-uses these functions to do recursive automated search of the menus for
-something that looks like the main feature.
----
- src/dvdnav.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
- src/dvdnav/dvdnav.h | 3 +++
- 2 files changed, 64 insertions(+)
-
-diff --git a/src/dvdnav.c b/src/dvdnav.c
-index 5859d6e..5349ecd 100644
---- a/src/dvdnav.c
-+++ b/src/dvdnav.c
-@@ -71,6 +71,67 @@ static dvdnav_status_t dvdnav_clear(dvdnav_t * this) {
- return DVDNAV_STATUS_OK;
- }
-
-+dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src) {
-+ dvdnav_t *this;
-+
-+ (*dest) = NULL;
-+ this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
-+ if(!this)
-+ return DVDNAV_STATUS_ERR;
-+
-+ memcpy(this, src, sizeof(dvdnav_t));
-+ this->file = NULL;
-+
-+ pthread_mutex_init(&this->vm_lock, NULL);
-+
-+ this->vm = vm_new_copy(src->vm);
-+ if(!this->vm) {
-+ printerr("Error initialising the DVD VM.");
-+ pthread_mutex_destroy(&this->vm_lock);
-+ free(this);
-+ return DVDNAV_STATUS_ERR;
-+ }
-+
-+ /* Start the read-ahead cache. */
-+ this->cache = dvdnav_read_cache_new(this);
-+
-+ (*dest) = this;
-+ return DVDNAV_STATUS_OK;
-+}
-+
-+dvdnav_status_t dvdnav_free_dup(dvdnav_t *this) {
-+
-+#ifdef LOG_DEBUG
-+ fprintf(MSG_OUT, "libdvdnav: free_dup:called\n");
-+#endif
-+
-+ if (this->file) {
-+ pthread_mutex_lock(&this->vm_lock);
-+ DVDCloseFile(this->file);
-+#ifdef LOG_DEBUG
-+ fprintf(MSG_OUT, "libdvdnav: close:file closing\n");
-+#endif
-+ this->file = NULL;
-+ pthread_mutex_unlock(&this->vm_lock);
-+ }
-+
-+ /* Free the VM */
-+ if(this->vm)
-+ vm_free_copy(this->vm);
-+
-+ pthread_mutex_destroy(&this->vm_lock);
-+
-+ /* We leave the final freeing of the entire structure to the cache,
-+ * because we don't know, if there are still buffers out in the wild,
-+ * that must return first. */
-+ if(this->cache)
-+ dvdnav_read_cache_free(this->cache);
-+ else
-+ free(this);
-+
-+ return DVDNAV_STATUS_OK;
-+}
-+
- dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) {
- dvdnav_t *this;
- struct timeval time;
-diff --git a/src/dvdnav/dvdnav.h b/src/dvdnav/dvdnav.h
-index 3e1b91a..ca78099 100644
---- a/src/dvdnav/dvdnav.h
-+++ b/src/dvdnav/dvdnav.h
-@@ -89,6 +89,9 @@ typedef int32_t dvdnav_status_t;
- */
- dvdnav_status_t dvdnav_open(dvdnav_t **dest, const char *path);
-
-+dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src);
-+dvdnav_status_t dvdnav_free_dup(dvdnav_t *this);
-+
- /*
- * Closes a dvdnav_t previously opened with dvdnav_open(), freeing any
- * memory associated with it.
---
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index eb0b36c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-inttypes.patch
-0002-hurd.patch
-0003-Adds-a-function-to-create-a-dpu-of-a-dvdnav-handle.patch
--
libdvdnav packaging
More information about the pkg-multimedia-commits
mailing list