Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
533
Issue boards
Milestones
Wiki
Code
Merge requests
11
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
f05db3f9
Commit
f05db3f9
authored
5 years ago
by
Thomas Guillem
Browse files
Options
Downloads
Patches
Plain Diff
medialibrary: fix build with vlc-4.0
parent
10a441b6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!308
4.0: fix build
Pipeline
#10950
passed with stage
Stage:
in 27 minutes and 8 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
compile-medialibrary.sh
+3
-0
3 additions, 0 deletions
compile-medialibrary.sh
with
3 additions
and
0 deletions
compile-medialibrary.sh
+
3
−
0
View file @
f05db3f9
...
...
@@ -101,6 +101,9 @@ else
fi
if
[
"
$RELEASE
"
=
"1"
]
;
then
git reset
--hard
${
MEDIALIBRARY_HASH
}
# In case of VLC 4.0 build, we need this commit to fix the build, but we
# still don't want to change the HASH for that.
git cherry-pick bfb2ad6e8b34a62c482e3064e6e13751482b903f
fi
cd
${
SRC_DIR
}
echo
-e
"
\e
[1m
\e
[36mCFLAGS:
${
CFLAGS
}
\e
[0m"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment