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

[FIX] Updated preprocessor directives for macOS #1661

Merged
merged 1 commit into from
Feb 23, 2025

Conversation

vats004
Copy link
Contributor

@vats004 vats004 commented Feb 10, 2025

In raising this pull request, I confirm the following (please check boxes):

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.
  • I have mentioned this change in the changelog.

My familiarity with the project is as follows (check one):

  • I have never used CCExtractor.
  • I have used CCExtractor just a couple of times.
  • I absolutely love CCExtractor, but have not contributed previously.
  • I am an active contributor to CCExtractor(hopefully)

I tried compiling ccxr on mac and ran into a few problems

  1. In [src/thirdparty/freetype/gzip/ftzconf.h], typedef Byte was not happening in case the OS was MacOS
  2. Updated the prepocessor directives (in [src/thirdparty/freetype/gzip/ftzconf.h]) used for identifying if the OS is MacOS to newer standards : __APPLE__ and __MACH__

@ccextractor-bot
Copy link
Collaborator

CCExtractor CI platform finished running the test files on linux. Below is a summary of the test results, when compared to test for commit cbd8e27...:

Report Name Tests Passed
Broken 0/13
CEA-708 0/14
DVB 0/7
DVD 0/3
DVR-MS 0/2
General 0/27
Hauppage 0/3
MP4 0/3
NoCC 0/10
Options 0/86
Teletext 0/21
WTV 0/13
XDS 0/34

All tests passing on the master branch were passed completely.

NOTE: The following tests have been failing on the master branch as well as the PR:


Check the result page for more info.

@ccextractor-bot
Copy link
Collaborator

CCExtractor CI platform finished running the test files on windows. Below is a summary of the test results, when compared to test for commit cbd8e27...:

Report Name Tests Passed
Broken 13/13
CEA-708 14/14
DVB 7/7
DVD 3/3
DVR-MS 2/2
General 27/27
Hauppage 3/3
MP4 3/3
NoCC 10/10
Options 80/86
Teletext 21/21
WTV 13/13
XDS 34/34

All tests passing on the master branch were passed completely.

NOTE: The following tests have been failing on the master branch as well as the PR:

Congratulations: Merging this PR would fix the following tests:


Check the result page for more info.

@vats004 vats004 changed the title Almanac Updated preprocessor directives for macOS Feb 11, 2025
@vats004 vats004 marked this pull request as ready for review February 11, 2025 13:21
@vats004 vats004 changed the title Updated preprocessor directives for macOS [FIX] Updated preprocessor directives for macOS Feb 13, 2025
@vats004
Copy link
Contributor Author

vats004 commented Feb 21, 2025

Hi, @canihavesomecoffee @cfsmp3
Can you please review this PR
This is a quick fix and I can refactor the existing code as per your suggestions

@cfsmp3
Copy link
Contributor

cfsmp3 commented Feb 22, 2025

Hi, @canihavesomecoffee @cfsmp3 Can you please review this PR This is a quick fix and I can refactor the existing code as per your suggestions

It needs to pass the format tests before it can be merged

@vats004
Copy link
Contributor Author

vats004 commented Feb 22, 2025

sure
I'll fix them right away

@vats004 vats004 marked this pull request as draft February 22, 2025 03:19
@vats004 vats004 force-pushed the almanac branch 2 times, most recently from bb02382 to 36258e8 Compare February 22, 2025 07:22
@vats004 vats004 marked this pull request as ready for review February 22, 2025 10:56
@vats004
Copy link
Contributor Author

vats004 commented Feb 22, 2025

Hi, @cfsmp3
I solved most of the formatting issues
but the rust formatting test is persistent and needs sloving this in /rust/src/lib.rs:

error: creating a mutable reference to mutable static is discouraged
   --> src/lib.rs:286:9
    |
286 |         ccx_options.copy_from_rust(opt);
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ mutable reference to mutable static

Should a new PR be opened for that as it needs some mutex implementation

@vats004 vats004 force-pushed the almanac branch 2 times, most recently from 568cc22 to ac8a70b Compare February 22, 2025 11:19
@vats004
Copy link
Contributor Author

vats004 commented Feb 22, 2025

It should pass that test too since @canihavesomecoffee and @PunitLodha solved that issue

@cfsmp3
Copy link
Contributor

cfsmp3 commented Feb 22, 2025

It should pass that test too since @canihavesomecoffee and @PunitLodha solved that issue

Please rebase

@vats004
Copy link
Contributor Author

vats004 commented Feb 23, 2025

It should pass that test too since @canihavesomecoffee and @PunitLodha solved that issue

Please rebase

done

@cfsmp3 cfsmp3 self-requested a review February 23, 2025 18:48
@cfsmp3 cfsmp3 merged commit 8c90bda into CCExtractor:master Feb 23, 2025
43 of 45 checks passed
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.

3 participants