Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
cb84f9ac
Commit
cb84f9ac
authored
Nov 19, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: disable png code in SDL_image
we already have a png decoder
parent
58ac662c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
contrib/src/SDL_image/pkg-config.patch
contrib/src/SDL_image/pkg-config.patch
+1
-1
contrib/src/SDL_image/rules.mak
contrib/src/SDL_image/rules.mak
+2
-2
No files found.
contrib/src/SDL_image/pkg-config.patch
View file @
cb84f9ac
...
@@ -4,6 +4,6 @@
...
@@ -4,6 +4,6 @@
Version: @VERSION@
Version: @VERSION@
Requires: sdl >= @SDL_VERSION@
Requires: sdl >= @SDL_VERSION@
Libs: -L${libdir} -lSDL_image
Libs: -L${libdir} -lSDL_image
+Libs.private: -ljpeg -ltiff
-lpng -lz
+Libs.private: -ljpeg -ltiff
Cflags: -I${includedir}/SDL
Cflags: -I${includedir}/SDL
contrib/src/SDL_image/rules.mak
View file @
cb84f9ac
...
@@ -19,10 +19,10 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz .sum-SDL_image
...
@@ -19,10 +19,10 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz .sum-SDL_image
$(APPLY)
$(SRC)
/SDL_image/pkg-config.patch
$(APPLY)
$(SRC)
/SDL_image/pkg-config.patch
$(MOVE)
$(MOVE)
DEPS_SDL_image
=
png
$(DEPS_png)
jpeg
$(DEPS_jpeg)
tiff
$(DEPS_tiff)
\
DEPS_SDL_image
=
jpeg
$(DEPS_jpeg)
tiff
$(DEPS_tiff)
\
sdl
$(DEPS_sdl)
sdl
$(DEPS_sdl)
.SDL_image
:
SDL_image
.SDL_image
:
SDL_image
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
--enable-tif
--disable-sdltest
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
--enable-tif
--disable-sdltest
--disable-png
cd
$<
&&
$(MAKE)
install
cd
$<
&&
$(MAKE)
install
touch
$@
touch
$@
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