search

seeing-things / zwo

ZWO SDK and custom software for debugging and using it.
23 stars 4 forks source link

Add amd64 include dir to setup.py #59

Closed bgottula closed 3 years ago

jgottula commented 3 years ago

Ah dammit, does it actually need that directory explicitly requested? Oh well.

bgottula commented 3 years ago

Actually, you know what, I'm going to push new packages (revision -4) that don't use arch-specific subdirectories for the include directory. Frankly that whole idea was a carryover from earlier packages I had made a while back that were arch-specific; I just kept it for the "new" arch-specific packages, and in retrospect, it's dumb and should be undone.

Okay that works for me. Let me know when that is ready to test.

jgottula commented 3 years ago

Good timing, actually. I just barely finished uploading the new package files.

I sort of reworked literally everything again. Because of course I did.

The new structure is that there's a "meta-package" named libasicamera2 (same name as always), which is all you actually need to explicitly install. It has no contents itself, but it pulls in dependencies on libasicamera2-common and libasicamera2-bin.

I've now moved the common files (which includes the header file) into the libasicamera2-common package, which avoids same-file conflicts (that was the whole reason why I did the wacky thing with using arch-specific include subdirectories before... it was just a "clever" workaround for allowing multiple arch-specific packages to be installed at once and not have their contents conflict).

And now the actual library binary files themselves are in libasicamera2-bin-i386 and libasicamera2-bin-amd64, which are actually independently named packages (those are hyphens and not colons); in both cases, there's a Provides: libasicamera2-bin clause in the control file, so having one or both installed should satisfy the dependency from the meta-package.

So basically, at this point, uninstall whatever libasicamera2 package(s) you currently have installed; and then, in a separate step, install just the libasicamera2 1.16.3-4 package. If I did everything right, it should automagically select libasicamera2-common and libasicamera2-bin-amd64 for installation as dependencies as well. (If it doesn't, then I screwed something up. 😅)

jgottula commented 3 years ago

And if I did everything right, then this PR should be moot.

bgottula commented 3 years ago

Great, thanks! I kicked off a new test to run overnight.

bgottula commented 3 years ago

Test passed!