Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
461a0548
Commit
461a0548
authored
Mar 25, 2013
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: dvdread: remove patch applied upstream
parent
bab3b9cb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
26 deletions
+0
-26
contrib/src/dvdread/osx.patch
contrib/src/dvdread/osx.patch
+0
-25
contrib/src/dvdread/rules.mak
contrib/src/dvdread/rules.mak
+0
-1
No files found.
contrib/src/dvdread/osx.patch
deleted
100644 → 0
View file @
bab3b9cb
From 7d9b5ac491659360cce4ba912f31b7fa2a020c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Tue, 19 Feb 2013 15:02:41 +0100
Subject: [PATCH] Use the correct libraries for linker test
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 30cab8d..7a2917b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,7 +186,7 @@
dnl link with libdvdcss
*darwin*) CSS_LIBS="${CSS_LIBS} -Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
;;
esac
- AC_CHECK_LIB(dvdcss, dvdcss_interface_2,, AC_MSG_ERROR(You need libdvdcss.so.2 or later))
+ AC_CHECK_LIB(dvdcss, dvdcss_interface_2,, AC_MSG_ERROR(You need libdvdcss.so.2 or later), ${CSS_LIBS})
AC_CHECK_HEADERS(dvdcss/dvdcss.h,, AC_MSG_ERROR(You need libdvdcss (dvdcss.h)))
fi
--
1.7.10.4
contrib/src/dvdread/rules.mak
View file @
461a0548
...
...
@@ -29,7 +29,6 @@ dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.xz .sum-dvdread
ifdef
HAVE_WIN32
$(APPLY)
$(SRC)
/dvdread/dvdread-win32.patch
endif
$(APPLY)
$(SRC)
/dvdread/osx.patch
cd
$(UNPACK_DIR)
&&
autoreconf
-ivf
$(MOVE)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment