Hi,
can you help and advise how to proceed. I want to push a PR, but I have done some changes on cmake. I have never pushed such PR and I am a bit confused cause it seems cmake is outside of the main package (kplayer).
I committed the changes for cmake in cmake and was thinking to commit iun kplayer but got some doubts.
# repo-master/tde/1_git/tde/main/applications/kplayer$ git status On branch issue/1/kplayer Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory)
modified: cmake (new commits)
Untracked files: (use "git add <file>..." to include in what will be committed)
.project
no changes added to commit (use "git add" and/or "git commit -a") # repo-master/tde/1_git/tde/main/applications/kplayer$ git diff diff --git a/cmake b/cmake index 8668335..bcfb5b2 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 8668335711fa13cec276552d75bfbb4285c7edb0 +Subproject commit bcfb5b2b09fe32b35b65aee16697992648cd740e
Thanks in advance
On Sunday 16 of February 2020 19:09:19 deloptes wrote:
Hi,
can you help and advise how to proceed. I want to push a PR, but I have done some changes on cmake. I have never pushed such PR and I am a bit confused cause it seems cmake is outside of the main package (kplayer).
I committed the changes for cmake in cmake and was thinking to commit iun kplayer but got some doubts.
# repo-master/tde/1_git/tde/main/applications/kplayer$ git status On branch issue/1/kplayer Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory)
modified: cmake (new commits)Untracked files: (use "git add <file>..." to include in what will be committed)
.projectno changes added to commit (use "git add" and/or "git commit -a") # repo-master/tde/1_git/tde/main/applications/kplayer$ git diff diff --git a/cmake b/cmake index 8668335..bcfb5b2 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 8668335711fa13cec276552d75bfbb4285c7edb0 +Subproject commit bcfb5b2b09fe32b35b65aee16697992648cd740e
Thanks in advance
Hi Emanoil,
your branch seems to be based on an older "head" than the current master branch. It's good to rebase your branch to the current master:
git rebase -S master
If you don't use the GPG signature, skip the -S option.
Cheers
Slávek Banko wrote:
git rebase -S master
doesn't help much
#repo-master/tde/1_git/tde/main/applications/kplayer$ git rebase -S master Current branch issue/1/kplayer is up to date. #repo-master/tde/1_git/tde/main/applications/kplayer$ git branch * issue/1/kplayer master #repo-master/tde/1_git/tde/main/applications/kplayer$ git checkout master M cmake Switched to branch 'master' Your branch is up to date with 'origin/master'. #repo-master/tde/1_git/tde/main/applications/kplayer$ git rebase -S master Current branch master is up to date. #repo-master/tde/1_git/tde/main/applications/kplayer$
again this https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
#repo-master/tde/1_git/tde/main/applications/kplayer$ cat ../../../.git/modules/main/applications/kplayer/config [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true worktree = ../../../../../main/applications/kplayer [remote "origin"] url = https://mirror.git.trinitydesktop.org/gitea/TDE/kplayer fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master [submodule "admin"] url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin [submodule "cmake"] url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
thanks in advance
deloptes wrote:
Slávek Banko wrote:
git rebase -S master
doesn't help much
#repo-master/tde/1_git/tde/main/applications/kplayer$ git rebase -S master Current branch issue/1/kplayer is up to date. #repo-master/tde/1_git/tde/main/applications/kplayer$ git branch
- issue/1/kplayer master
#repo-master/tde/1_git/tde/main/applications/kplayer$ git checkout master M cmake Switched to branch 'master' Your branch is up to date with 'origin/master'. #repo-master/tde/1_git/tde/main/applications/kplayer$ git rebase -S master Current branch master is up to date. #repo-master/tde/1_git/tde/main/applications/kplayer$
again this
https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
#repo-master/tde/1_git/tde/main/applications/kplayer$ cat ../../../.git/modules/main/applications/kplayer/config [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true worktree = ../../../../../main/applications/kplayer [remote "origin"] url = https://mirror.git.trinitydesktop.org/gitea/TDE/kplayer fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master [submodule "admin"] url =
https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"] url =
https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
thanks in advance
dont'know why gmane dcided to replace system at scm.trinitydesktop.org with its own address, but in the config file it is system at scm.trinitydesktop.org
On Sunday 16 of February 2020 22:30:57 deloptes wrote:
Slávek Banko wrote:
git rebase -S master
doesn't help much
#repo-master/tde/1_git/tde/main/applications/kplayer$ git rebase -S master Current branch issue/1/kplayer is up to date. #repo-master/tde/1_git/tde/main/applications/kplayer$ git branch
- issue/1/kplayer master
#repo-master/tde/1_git/tde/main/applications/kplayer$ git checkout master M cmake Switched to branch 'master' Your branch is up to date with 'origin/master'. #repo-master/tde/1_git/tde/main/applications/kplayer$ git rebase -S master Current branch master is up to date. #repo-master/tde/1_git/tde/main/applications/kplayer$
again this https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
#repo-master/tde/1_git/tde/main/applications/kplayer$ cat ../../../.git/modules/main/applications/kplayer/config [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true worktree = ../../../../../main/applications/kplayer [remote "origin"] url = https://mirror.git.trinitydesktop.org/gitea/TDE/kplayer fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master [submodule "admin"] url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin [submodule "cmake"] url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
thanks in advance
I don't know if you have your git clone updated. You can try these steps (in kplayer directory):
git checkout master ../../../scripts/switch_all_submodules_to_head_and_clean anonymous git checkout issue/1/kplayer git rebase -S master git status
Cheers
Slávek Banko wrote:
I don't know if you have your git clone updated. You can try these steps (in kplayer directory):
git checkout master ../../../scripts/switch_all_submodules_to_head_and_clean anonymous git checkout issue/1/kplayer git rebase -S master git status
Hi Slavek,
this solves only kplayer part, but cmake is still @master and when I do something there it says:
repo-master/tde/1_git/tde/main/applications/kplayer$ git status On branch issue/1/kplayer Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) (commit or discard the untracked or modified content in submodules)
modified: CMakeLists.txt modified: cmake (untracked content)
repo-master/tde/1_git/tde/main/applications/kplayer$ git submodule status cmake 8668335711fa13cec276552d75bfbb4285c7edb0 cmake (r14.0.0-60-g8668335)
thank you in advance
regards
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512
Hi Slavek,
this solves only kplayer part, but cmake is still @master and when I do something there it says:
repo-master/tde/1_git/tde/main/applications/kplayer$ git status On branch issue/1/kplayer Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) (commit or discard the untracked or modified content in submodules)
modified: CMakeLists.txt modified: cmake (untracked content)
repo-master/tde/1_git/tde/main/applications/kplayer$ git submodule status cmake 8668335711fa13cec276552d75bfbb4285c7edb0 cmake (r14.0.0-60-g8668335)
thank you in advance
regards
Hi Emanoil, if you made changes on cmake, you need to create a PR on common cmake module. Be aware that those changes will be seen in all modules, so make sure they are genearal and not specific for kplayer. Cheers Michele
Michele Calgaro via trinity-devel wrote:
Hi Emanoil, if you made changes on cmake, you need to create a PR on common cmake module. Be aware that those changes will be seen in all modules, so make sure they are genearal and not specific for kplayer. Cheers Michele
Thank you Michele,
in common/cmake there are only TDE related. What I am missing is cmake to check if libdvdread, libdvdnav, libdvdcss was installed also if WITH_ALL_OPTIONS=ON to enable WITH_DVDCSS.
Might be the functionality should go into the local ConfigureChecks.cmake ?
pls advise
thanks
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512
Thank you Michele,
in common/cmake there are only TDE related. What I am missing is cmake to check if libdvdread, libdvdnav, libdvdcss was installed also if WITH_ALL_OPTIONS=ON to enable WITH_DVDCSS.
Might be the functionality should go into the local ConfigureChecks.cmake ?
pls advise
ok, in that case you probably need to make changes to the cmake files in kplayer, not to the common module. So those chagnes would go in the same PR as kplayer. Not sure I had misunderstood your original statement "I made changes to cmake" :-) Cheers Michele
Michele Calgaro via trinity-devel wrote:
ok, in that case you probably need to make changes to the cmake files in kplayer, not to the common module. So those chagnes would go in the same PR as kplayer. Not sure I had misunderstood your original statement "I made changes to cmake" :-) Cheers Michele
Hi Michele, I changed the CMakeLists.txt to include FindLibDvd. I was thinking that FindLibDvd can be added somehow to kplayers cmake modules.
-
deloptes -
Michele Calgaro via trinity-devel -
Slávek Banko