Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge rem into re #683

Merged
merged 11 commits into from Feb 16, 2023
Merged

merge rem into re #683

merged 11 commits into from Feb 16, 2023

Conversation

alfredh
Copy link
Contributor

@alfredh alfredh commented Feb 6, 2023

No description provided.

@sreimers sreimers added this to the v2.13.0 milestone Feb 6, 2023
@robert-scheck
Copy link
Contributor

May I kindly ask for some explanation? I'm not against this, I just would like to understand why rem will be merged into re.

@alfredh
Copy link
Contributor Author

alfredh commented Feb 7, 2023

looks like the MinGW build is failing:

CMake Error: The source directory "/home/runner/work/re/re/baresip-win32/rem" does not exist.

I have also made a PR for baresip-win32 but I am not sure if it is picked up?

@sreimers
Copy link
Member

sreimers commented Feb 7, 2023

I have also made a PR for baresip-win32 but I am not sure if it is picked up?

I think its not, can you try with dependency helper:

--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -34,9 +34,14 @@ jobs:
         repo: https://github.com/baresip/retest
         secret: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: "clone baresip-win32 repo"
+    - uses: sreimers/pr-dependency-action@v0.5
+      with:
+        name: baresip-win32
+        repo: https://github.com/baresip/baresip-win32
+        secret: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: "baresip-win32 repo"
       run: |
-        git clone https://github.com/baresip/baresip-win32.git
         mv rem baresip-win32/
         mv retest baresip-win32/

@sreimers
Copy link
Member

sreimers commented Feb 7, 2023

May I kindly ask for some explanation? I'm not against this, I just would like to understand why rem will be merged into re.

from my perspective mainly to simplify maintenance and development, some benefits are:

  • We can remove some PR dependency workarounds
  • Improve CI Jobs (like coverage, remove redundant jobs)
  • One Changelog/Release

@juha-h
Copy link
Contributor

juha-h commented Feb 12, 2023

Tried on Debian. Worked OK, but debian/control needs librem dependency removed from line:

control:Depends: ${shlibs:Depends}, ${misc:Depends}, librem (>= 2.8.0), libre (>= 2.8.0)

Will try later on Android.

@alfredh
Copy link
Contributor Author

alfredh commented Feb 15, 2023

@juha-h
Copy link
Contributor

juha-h commented Feb 15, 2023

Now Debian libre build gave these warnings:

dpkg-shlibdeps: warning: symbol sqrt used by debian/libre/usr/lib/x86_64-linux-gnu/libre.so.14.12.0 found in none of the libraries
dpkg-shlibdeps: warning: symbol sin used by debian/libre/usr/lib/x86_64-linux-gnu/libre.so.14.12.0 found in none of the libraries
dpkg-shlibdeps: warning: symbol cos used by debian/libre/usr/lib/x86_64-linux-gnu/libre.so.14.12.0 found in none of the libraries
dpkg-shlibdeps: warning: symbol lrint used by debian/libre/usr/lib/x86_64-linux-gnu/libre.so.14.12.0 found in none of the libraries
dpkg-shlibdeps: warning: symbol log10 used by debian/libre/usr/lib/x86_64-linux-gnu/libre.so.14.12.0 found in none of the libraries

@alfredh
Copy link
Contributor Author

alfredh commented Feb 16, 2023

looks like linking to libm was missing...

@sreimers should we merge this to main now ?

@sreimers
Copy link
Member

@sreimers should we merge this to main now ?

Yes, looks good to me. Thanks!

@sreimers sreimers merged commit fd6c4e0 into main Feb 16, 2023
@sreimers sreimers deleted the merge_librem_into_here branch February 16, 2023 08:21
freebsd-git pushed a commit to freebsd/freebsd-ports that referenced this pull request Sep 10, 2023
audio/rem is now merged into audio/re [1]

[1] baresip/re#683

Reported by:	Herbert J. Skuhra <herbert@gojira.at> (by email)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants