Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
f66f01a1
Commit
f66f01a1
authored
May 26, 2008
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix FFmpeg .pc creation - patch to be sent at FFmpeg developers
parent
213cea9c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+1
-0
extras/contrib/src/Patches/ffmpeg-pkg-config.patch
extras/contrib/src/Patches/ffmpeg-pkg-config.patch
+20
-0
No files found.
extras/contrib/src/Makefile
View file @
f66f01a1
...
...
@@ -1068,6 +1068,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
ifdef
SVN
ffmpeg
:
$(SVN)
co
$(FFMPEG_SVN)
ffmpeg
-r
12920
(
cd
$@
;
patch
-p0
< ../Patches/ffmpeg-pkg-config.patch
)
ifeq
($(HOST),i586-pc-beos)
(
cd
$@
;
patch
-p0
< ../Patches/ffmpeg-svn-beos.patch
)
endif
...
...
extras/contrib/src/Patches/ffmpeg-pkg-config.patch
0 → 100644
View file @
f66f01a1
Index: configure
===================================================================
--- configure (révision 13435)
+++ configure (copie de travail)
@@ -2169,11 +2169,13 @@
version=$3
libs=$4
requires=$5
+libdir_pc=`echo $libdir|sed s'|$(PREFIX)|${prefix}|'`
+incdir_pc=`echo $incdir|sed 's|$(PREFIX)|${prefix}|'`
cat <<EOF > $name.pc
prefix=$prefix
exec_prefix=\${prefix}
-libdir=$libdir
-includedir=$incdir
+libdir=$libdir_pc
+includedir=$incdir_pc
Name: $name
Description: $comment
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